merging files created with same names on two branches
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
High
|
Unassigned | ||
Breezy |
Triaged
|
High
|
Unassigned |
Bug Description
The process
bzr merge other
bzr revert *
bzr commit
< edit file on `other' branch >
bzr merge other
causes contents conflicts (not text conflicts) for `file' and does `bzr add file.OTHER' when `file' was independently created in both branches.
On that case, I expect a text conflict. This expectation is reinforzed by the fact that bzr, on the second merge, does not report conflicts if `file' has the same contents on both branches.
As a bonus, executing `remerge' afterwards renames the *.OTHER and *.BASE files previously created to *.OTHER.OTHER and *.OTHER.BASE
The sequence "merge && revert * && commit" is useful for people that migrated from svn or uses bzr-svn. See
http://
The attached script reproduces the problem.
Changed in bzr: | |
status: | New → Confirmed |
importance: | Undecided → Medium |
tags: | added: merge |
tags: | added: remerge |
tags: | added: conflicts |
Changed in bzr: | |
importance: | Medium → High |
tags: | added: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → High |
tags: |
added: foreignremerge removed: check-for-breezy remerge |
tags: |
added: foreign remerge removed: foreignremerge |
Just adding a comment after encountering the same issue...
I think this is a fairly important issue as Bazaar aims to be an intuitive DVCS.
It is quite common for two users to create the same file or folder on necessity OR as an effort to resolve or cherry pick a merge (bad idea).
To the user(s), they see the same file / folder names and same / similar content, yet the resolution of the conflict is not easily understood even if the conflict does make sense from a VCS database point of view.
The user needs a way to simply say 'these are the same thing', mark as resolved or enable text conflict.
The work around of deleting or renaming one users content is confusing but may still be acceptable if the user is clearly informed of the issue and steps to resolve it.