merge 2 unrelated branches in rich-root format cause path conflict for the same file-id
Bug #484706 reported by
apm
This bug affects 2 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Low
|
Unassigned |
Bug Description
A bit simpler reproduction sequence:
C:\Temp\3>bzr init a
Created a standalone tree (format: 2a)
C:\Temp\3\a>echo foo > foo
C:\Temp\3\a>echo bar > bar
C:\Temp\3\a>bzr add
adding bar
adding foo
C:\Temp\3\a>bzr ci -m1
Committing to: C:/Temp/3/a/
added bar
added foo
Committed revision 1.
C:\Temp\3>bzr init b
Created a standalone tree (format: 2a)
C:\Temp\3\b>echo foo > foo
C:\Temp\3\b>echo spam > spam
C:\Temp\3\b>bzr add --file-ids-from ../a
adding foo w/ file id from foo
adding spam
C:\Temp\3\b>bzr ci -m2
Committing to: C:/Temp/3/b/
added foo
added spam
Committed revision 1.
C:\Temp\3\b>bzr merge -r0..-1 ../a
+N bar
Path conflict: foo / foo
1 conflicts encountered.
tags: | added: check-for-breezy |
To post a comment you must log in.
If instead "bzr init" use "bzr init --pack-0.92" all this works correctly.
/2# bzr merge -r0..-1 ../1
All changes applied successfully.