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

[John Arbash Meinel]

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

Robert Collins wrote:
| On Mon, 2008-06-02 at 00:05 -0500, John Arbash Meinel wrote:

...

| concretely, if you look at 'add_pending_merge' its meant to handle
| duplicate ids already - but its at the wrong level.
|
| Moving that check down to set_parent_ids/set_parent_trees, and turning
| it into a heads check would seem to be the most straight forward check.
|
| -Rob

So, the attached patch does this. I haven't run the full test suite yet, which
may show failures because of code that expected multiple merges to show up. But
I did add explicit tests for this behavior and all WT implementations pass.

I had to get rid of the 'status' test, because it isn't possible to trigger the
bug anymore. But the fix there was small. Certainly it seems like having
MergeSort fail if given an empty dictionary (with a last_revision) is a bit odd.
So I'm mostly okay with leaving the trivial fix in place.

John
=:->

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

iEYEARECAAYFAkhEG90ACgkQJdeBCYSNAAOTaACeIakT376vpYl68+4pvggj5Lzn
6w8AoNg2VNNaVjKyKN4gYn8NLEYPa+jT
=+Hnz
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: status_double_pending_235407b.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080602/dc6dda59/attachment.diff