Overview
| Artifact ID: | 514a4e8ed4ca0683769c8605205cd8269c3ab2b1 |
|---|---|
| Ticket: | 9ac3352f157bb62b4a484cf470622eac39e87117
After merge, revert -- "update" refuses to cooperate |
| User & Date: | ron 2010-01-25 05:13:31 |
Changes
- comment changed to:
Updated to the 'ssl' branch of the Fossil code. After a while, did a 'merge --cherrypick' to get particular change. Then decided to abandon the changes, so did 'revert'. Fossil updated the changed files. Now, when doing "update", Fossil says: <tt>fossil: cannot update an uncommitted merge</tt>
- foundin changed to: "c4c231069e4bde488725c80689c834106a969b44"
- private_contact changed to: "ddae85699df0ae84ab8e0a6a6dacf72bab6d4a7a"
- severity changed to: "Important"
- status changed to: "Open"
- title changed to:
After merge, revert -- "update" refuses to cooperate
- type changed to: "Code_Defect"