Too many conflicts on 'bzr update'
Bug #116655 reported by
Gioele Barabucci
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
New
|
Undecided
|
Unassigned |
Bug Description
If you try to update a local branch where there are local commits and uncommited changes, bzr will find a lot of conflicts:
$ bzr update
Text conflict in one
1 conflicts encountered.
Text conflict in one
Conflict adding file one.BASE. Moved existing file to one.BASE.moved.
Conflict adding file one.OTHER. Moved existing file to one.OTHER.moved.
Conflict adding file one.THIS. Moved existing file to one.THIS.moved.
4 conflicts encountered.
Updated to revision 1.
The attached script is a testcase for this strange behavior.
To post a comment you must log in.
Plese, run this script in a temporary empty directory.