Use suffixes like moved.2 instead of moved.moved.moved in case of conflicts
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Bug Description
I recently reverted Emacs' trunk to a previous revision and today I ran bzr pull with latest bzr.dev. I got some conflicts:
…
Text conflict in src/ChangeLog
Conflict adding file src/ChangeLog.BASE. Moved existing file to src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.THIS. Moved existing file to src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
Conflict adding file src/ChangeLog.
48 conflicts encountered.
Now on revision 100667.
…
These file names are insane, and a mess to clean up. Better use ChangeLog.
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
| Vincent Ladeuil (vila) wrote | #1 |
| tags: | added: conflicts |
| tags: | added: check-for-breezy |
Right, I'll note that you need to repeatedly *ignore* the conflicts without any attempt to solve them nor to get rid of them to end up in this situation, in your case, I'd say at least 4 times.
I think bzr is trying to tell you that you really should cleanup your tree before doing further merges
(or any operation that can produce conflicts) and does it by being more and more vocal.
Cleaning this mess may require 'bzr resolve --all', 'bzr clean-tree --detritus' (use --dry-run first for the later).