[MERGE] Reconcile can fix bad parent references

[Aaron Bentley]

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

Hi all,

This patch adds support for detecting and fixing bad parent references
in versionedfiles.

Some versionedfiles in the bzr.dev ancestry list versions as parents
that are not supposed to exist in the versionedfile-- that is, for text
version foo, inventory foo does not list foo as its revision (for the
appropriate file-id).

The correct parents for the versionedfile entry can be determined by
1. finding the parents of the corresponding revision, according to its XML
2. finding those parents' inventory revision values
3. removing duplicates from the result
4. restricting the list to head versions

This fix is implemented in my patch.

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

iD8DBQFG0gWP0F+nu1YWqI0RAj0fAJ9TIeFHm02hoov0UjpNyP2R39BxAQCdGxKl
qduh9v+v6YTAn6BeQMcRHQI=
=p2+J
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-mgCPjk.patch
Type: text/x-patch
Size: 43958 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070826/d94432b9/attachment-0001.bin