View Ticket
Not logged in
Ticket UUID: 9ac3352f157bb62b4a484cf470622eac39e87117
Title: After merge, revert -- "update" refuses to cooperate
Status: Open Type: Code_Defect
Severity: Important Priority:
Subsystem: Resolution:
Last Modified: 2010-01-25 05:13:31
Version Found In: c4c231069e4bde488725c80689c834106a969b44
Description & Comments:
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: fossil: cannot update an uncommitted merge