| Ticket UUID: | 30b28cf351fd81c2a30541e3eb9b6f25a67d5931 | ||
| Title: | Merge to the checkout (on update) fails, if with renames | ||
| Status: | Open | Type: | Code_Defect |
| Severity: | Important | Priority: | |
| Subsystem: | Resolution: | Open | |
| Last Modified: | 2011-10-12 16:24:30 | ||
| Version Found In: | [9f9047d686] | ||
| Description & Comments: | |||
|
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: | |||
View Ticket