Fossil

View Ticket
Login
Ticket Hash: 554f44ee74e3d3b9b24edd358f2bc3d8284f9ce5
Title: Interbranch interference with merges and renames
Status: Open Type: Code_Defect
Severity: Priority:
Subsystem: Resolution: Open
Last Modified: 2011-10-12 16:23:12
Version Found In: [d8221b9863] 2011-05-12
Description:
Finally I managed to reproduce the trouble I mentioned in [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg03885.html].

I'll attach a repository.

<hr /><i>viriketo added on 2011-06-14 15:17:02 UTC:</i><br />
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".

<hr /><i>viriketo added on 2011-06-15 07:43:05 UTC:</i><br />
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].

<hr /><i>viriketo added on 2011-06-21 08:17:16 UTC:</i><br />
I think even a cherrypick merge (if it sets an arrow in the checkin graph) can disrupt the renames.

<hr /><i>viriketo added on 2011-10-12 16:23:12 UTC:</i><br />
It may be fixed by [0b93b0f958].

Attachments: