Fossil SCM
Interbranch interference with merges and renames
554f44ee74e3d3b…
· opened 14 years, 9 months ago
- Type
- Code_Defect
- Priority
- —
- Severity
- —
- Resolution
- Open
- Subsystem
- —
- Created
- June 14, 2011 3:15 p.m.
Finally I managed to reproduce the trouble I mentioned in [http://www.mail-archive.com/[email protected]/msg03885.html].
I'll attach a repository.
viriketo added on 2011-06-14 15:17:02 UTC: Notice in 'tmp.fossil' how I created a branch named "branch". This has a rename from 'a' to 'b', and is never merged into trunk.
While working on the "branch2", and updating branch2 from trunk, the file 'a' gets deleted when running: "fossil merge trunk".
viriketo added on 2011-06-15 07:43:05 UTC: Notice that you have just done the checkin [1c4d1272a6] for this ticket. This change is the opposite to that done in checkin [ff2a87103b] to fix the behaviour described in ticket [74413366fe].
viriketo added on 2011-06-21 08:17:16 UTC: I think even a cherrypick merge (if it sets an arrow in the checkin graph) can disrupt the renames.
viriketo added on 2011-10-12 16:23:12 UTC: It may be fixed by [0b93b0f958].