[MERGE] Fix bug #235407, when the same revision is merged twice

[John Arbash Meinel]

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

See attached.

Basically with 'bzr merge --force' you can get revisions merged which are in the
ancestry of what you already have. My work to speed up displaying pending merges
~ didn't handle when there were no new revisions to be displayed.

This patch just shows the top level merge again. For example:

$ bzr st
pending merges:
~  John Arbash Meinel 2008-05-30 Y4
~    John Arbash Meinel 2008-05-30 Y3
~  John Arbash Meinel 2008-05-30 Y4


(Y4 was merged 2x)

Arguably the bug is in merge allowing this to happen, but it was easier for me
to fix 'bzr status'.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkhAgC4ACgkQJdeBCYSNAAP5/QCffY7AhZ+GJW/9QMjRuqd6eTqX
F98AmwRrykSIPM+oiGr8Ea8shr/lhSO5
=rQ1R
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: status_double_pending_235407-3463.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080530/e5032088/attachment.diff