Fossil SCM
After merge, revert -- "update" refuses to cooperate
Closed
9ac3352f157bb62…
· opened 16 years, 2 months ago
- Type
- Code_Defect
- Priority
- —
- Severity
- Important
- Resolution
- Overcome_By_Events
- Subsystem
- —
- Created
- Jan. 25, 2010 5:13 a.m.
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