[MERGE] remerge doesn't clobber unrelated conflicts

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Except it may be the wrong unconflicted state. (Since they aren't merged).
> 
> I'm okay with it, just not 100%.

Okay, here's a bundle that makes it impossible for the same file to have
the same conflict type repeated.  It adds WorkingTree.add_conflicts, and
uses it in Merger.  It also ensures that the conflict list is sorted.

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

iD8DBQFEqAb60F+nu1YWqI0RAh6yAJ4316BOvSUuGsD/Kgg8TPh/UDKolQCeM3+D
Jae3+/GErtCpOXShhaJJn/M=
=kei4
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: remerge-conflicts2.patch
Type: text/x-patch
Size: 22970 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060702/a284ad68/attachment.bin