Fossil SCM
Merge to the checkout (on update) fails, if with renames
Open
30b28cf351fd81c…
· opened 14 years, 10 months ago
- Type
- Code_Defect
- Priority
- —
- Severity
- Important
- Resolution
- Open
- Subsystem
- —
- Created
- June 7, 2011 7:07 p.m.
While a merge between branches may work, with a clean checkout, it failed for me to recognise the renames I had on my checkout at the time of running "fossil update".
Committing, resulting in a fork of the branch, and then merging the leaves with a clean checkout, worked as a trivial merge.
Luckily 'fossil update' invites to undo, and the harm is then minimum.
viriketo added on 2011-10-12 16:24:30 UTC: It may be fixed by [0b93b0f958].