[MERGE] reconcile patch to correct the ancestry graph.

[Robert Collins]

this fixes bug 29674 by allowing a manual command to correct the
ordering: we cannot correct it inside reweave because we dont know which
of the difffering representations is correct.

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: reconcile-improvements.patch
Type: text/x-patch
Size: 20343 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060502/630d06a0/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060502/630d06a0/attachment.pgp