[BUG] bzr lists basis revision as pending-merge after pull

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

If you do bzr pull with a recent version of bzr, your last revision will
be marked as a pending merge.  This is a bug, cause by the
implementation of merge.

Previously, if the merge base was an ancestor, the other-revision would
be set as a pending merge.  Now, the additional constraint is: the other
revision must not be in the revision history.

A fix is in my branch.

Aaron

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

iD8DBQFDG6hP0F+nu1YWqI0RAtloAKCH06zGHsPza+qVZnVfJ8+UMXY+CwCeIL60
QKgIyIqB+/HqpRNbY0Tbhcs=
=chGH
-----END PGP SIGNATURE-----