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

[Aaron Bentley]

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

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFE191N0F+nu1YWqI0RAvI/AJ0U6KV4JJtKVDLr44BulxZ9txTYegCdE0jv
MRAPtQN0TZ4r2Sk20xe7br8=
=2HJH
-----END PGP SIGNATURE-----