Update working tree parents when pulling new ancestry
Bug #55845 reported by
Robert Collins
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
| Breezy |
Triaged
|
Low
|
Unassigned | ||
Bug Description
If I have a working tree at revision C, with a pending merge of B and do a pull from a branch which brings in revision A, which has C in its ancestry, and B in its ancestry, we currently leave B as a pending merge - but this is in fact incorrect - we've pulled in the merge of B already.
I think the right thing to do on pull is to remove all parents of the tree which are now in the ancestry of the new left most parent.
Revision history for this message
| Vincent Ladeuil (vila) wrote Re: Update ancestry of working tree with pending merges | #1 |
| description: | updated |
Revision history for this message
| John A Meinel (jameinel) wrote Re: Update working tree pending merges when pulling new ancestry | #2 |
| description: | updated |
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | Unconfirmed → Confirmed |
| tags: | added: workingtree |
| tags: | added: check-for-breezy |
| tags: | removed: check-for-breezy |
| Changed in brz: | |
| status: | New → Incomplete |
| status: | Incomplete → Triaged |
| importance: | Undecided → Low |
To post a comment you must log in.
I updated the description summary as empty summaries made the bug unclickable in lists. Please check.