[MERGE][bug 336749] deal with text revisions that originated in revisions that are ghosts in reconcile

[Jelmer Vernooij]

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

The attached patch fixes reconcile to deal with text revisions that
are present in present inventories, but originated in ghost revisions.

Thanks to John for helping debug what was actually going wrong here.

Cheers,

Jelmer
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iJwEAQECAAYFAkoeqVYACgkQDLQl4QYPZuX2fQQAgQZSTZ8Osw1jF/Hud/gUBLW3
PgUyBhXsmowG1ZWjQ5sNT8bHtuU6UeJUODq9YIS9GDkQe+lL/PvM5YljnLH3+bJq
qpU4hgzghKfQAffYQ0USuTKxMf43Cm0frxUYA5jOzzTeGsswf05fCSxtZrYJDtK1
S55ubQIrvo33m3iJKHw=
=A4bB
-----END PGP SIGNATURE-----

-------------- next part --------------
A non-text attachment was scrubbed...
Name: referenced-ghost-text-4386.patch
Type: text/x-diff
Size: 6046 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090528/dd6eca13/attachment.bin