merging files created with same names on two branches

Bug #519024 reported by Oscar Fuentes
This bug affects 2 people
Affects Status Importance Assigned to Milestone

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

The attached script reproduces the problem.

Revision history for this message
Oscar Fuentes (oscarfv) wrote :
Martin Pool (mbp)
Changed in bzr:
status: New → Confirmed
importance: Undecided → Medium
tags: added: merge
Vincent Ladeuil (vila)
tags: added: remerge
Revision history for this message
Greg (gregspecialsource) wrote :

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.

Vincent Ladeuil (vila)
tags: added: conflicts
Changed in bzr:
importance: Medium → High
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
Jelmer Vernooij (jelmer)
Changed in brz:
status: New → Triaged
importance: Undecided → High
tags: added: foreignremerge
removed: check-for-breezy remerge
tags: added: foreign remerge
removed: foreignremerge
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.