[merge][0.10] 'bzr uncommit' should preserve pending merges

[John Arbash Meinel]

Recently I fixed uncommit so that it will preserve existing merges, and
bring them back as pending merges. Robert noticed that I was throwing
away existing pending merges.

The attached patch adds tests for this and a simple fix. I think it is
0.10 worthy.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: uncommit-57660.patch
Type: text/x-patch
Size: 3688 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060825/854087ad/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060825/854087ad/attachment.pgp