| 2006-08-10 05:54:04 |
Robert Collins |
bug |
|
|
added bug |
| 2006-09-16 14:25:14 |
Vincent Ladeuil |
description |
Robert Collins wrote:
> 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.
I agree.
affects /products/bzr
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
|
Robert Collins wrote:
> 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.
I agree.
affects /products/bzr
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
|
|
| 2006-09-16 14:25:14 |
Vincent Ladeuil |
title |
|
Update ancestry of working tree with pending merges |
|
| 2006-10-11 01:31:08 |
John A Meinel |
description |
Robert Collins wrote:
> 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.
I agree.
affects /products/bzr
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
|
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.
|
|
| 2006-10-11 01:31:08 |
John A Meinel |
title |
Update ancestry of working tree with pending merges |
Update working tree pending merges when pulling new ancestry |
|
| 2006-10-11 01:33:08 |
John A Meinel |
bzr: status |
Unconfirmed |
Confirmed |
|
| 2006-10-11 01:33:08 |
John A Meinel |
bzr: importance |
Undecided |
Medium |
|
| 2006-10-11 01:33:08 |
John A Meinel |
bzr: statusexplanation |
|
Fixing the title to be even more accurate. Marking it as a real bug with medium priority. It probably doesn't happen often, but our current code would generate semi-incorrect ancestry information. |
|
| 2006-10-11 01:48:37 |
John A Meinel |
title |
Update working tree pending merges when pulling new ancestry |
Update working tree parents when pulling new ancestry |
|
| 2011-02-01 22:37:41 |
Jelmer Vernooij |
tags |
|
workingtree |
|
| 2017-11-08 22:56:09 |
Jelmer Vernooij |
tags |
workingtree |
check-for-breezy workingtree |
|
| 2018-09-23 01:24:10 |
Jelmer Vernooij |
tags |
check-for-breezy workingtree |
workingtree |
|
| 2018-09-23 01:24:21 |
Jelmer Vernooij |
bug task added |
|
brz |
|
| 2018-09-23 01:24:33 |
Jelmer Vernooij |
brz: status |
New |
Incomplete |
|
| 2018-09-23 01:24:36 |
Jelmer Vernooij |
brz: status |
Incomplete |
Triaged |
|
| 2018-09-23 01:24:41 |
Jelmer Vernooij |
brz: importance |
Undecided |
Low |
|
