[MERGE] Reconcile can fix bad parent references

[Aaron Bentley]

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

Here is a new patch which I believe resolves all your concerns.

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

iD8DBQFG1MJB0F+nu1YWqI0RAgLAAJwJoJLwTDmAAs8bF5aTa+mskgJXDgCfeJF0
qXZX2/uFpQLyglKPB6N+zKE=
=ESaz
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: resolve-text-parents.patch
Type: text/x-patch
Size: 51001 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070828/b28a263b/attachment-0001.bin