[RFC][BUG?] pull does not de-dup pending merges

[Robert Collins]

On Mon, 2006-08-07 at 20:39 -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> 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 wonder whether it would be better to do de-duping in commit and
> status?  That might be safer, and avoid us having to chase down bugs in
> each command that changes pending-merges or last-revision.

We do in commit already. We could.should in status - or perhaps better,
we should in tree.set_parent_trees which I'm working on at the moment.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060808/fd6a65fa/attachment-0001.pgp