Comment 0 for bug 55845

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>.