When doing a merge into a tree that already has merged, the common base detection should take all parents into consideration.
Bug #60467 reported by
Robert Collins
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Wishlist
|
Unassigned | ||
| Breezy |
Triaged
|
Wishlist
|
Unassigned | ||
Bug Description
I.e. if I do:
bzr merge $branch
fix conflicts
run tests - failure
ask the maintainer of $branch - they have a fix which they have
committed
bzr merge --force $branch
The second merge should choose the revision of $branch I had
merged the
first time as the common base.
affects /products/bzr
--
GPG key available at: <http://
Revision history for this message
| John A Meinel (jameinel) wrote | #1 |
| Changed in bzr: | |
| importance: | Undecided → Wishlist |
| status: | Unconfirmed → Confirmed |
| tags: | added: check-for-breezy |
| Changed in brz: | |
| status: | New → Triaged |
| importance: | Undecided → Wishlist |
| tags: |
added: merge removed: check-for-breezy |
To post a comment you must log in.
Could be nice, bzr merge --force is uncommon enough to not merit high priority.