Fossil: View Ticket

2011-10-12
16:23		• Ticket [554f44ee74] Interbranch interference with merges and renames status still Open with 1 other change artifact: f7ae336113 user: viriketo
2011-06-21
08:17		• Ticket [554f44ee74]: 1 change artifact: 8f7e7a08b9 user: viriketo
2011-06-17
19:09		Adding a first test for merging branches with renames. Related to ticket [554f44ee74]. check-in: 8526b151fc user: viriketo tags: merge_renames
2011-06-15
07:43		• Ticket [554f44ee74] Interbranch interference with merges and renames status still Open with 1 other change artifact: 14c30ffd4a user: viriketo
2011-06-14
23:59		When doing a merge, only follow direct ancestor links when computing the set of filename changes. Do not follow merge links as this can result in non-intuitive changes. Ticket [554f44ee74e3d3b]. check-in: 1c4d1272a6 user: drh tags: trunk
15:17		• Ticket [554f44ee74] Interbranch interference with merges and renames status still Open with 2 other changes artifact: 5e0ca28d45 user: viriketo
15:16		• Add attachment tmp.fossil to ticket [554f44ee74] artifact: 8c7bc0fe46 user: viriketo
15:15		• New ticket [554f44ee74] Interbranch interference with merges and renames. artifact: 712ac75063 user: viriketo

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 14.47 years ago	Created:	2011-06-14 15:15:40 14.80 years ago
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.

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].

Attachments:

tmp.fossil [download] added by viriketo on 2011-06-14 15:16:02. [details]