[MERGE] Prevent knit corruption by checking parents

[Aaron Bentley]

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

Aaron Bentley wrote:
> This patch causes a KnitTextsDiffer exception to be raised when knits
> disagree about the content of a parent.

Updated so that KnitTextsDiffer is a printable exception...

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

iD8DBQFFEr460F+nu1YWqI0RAgAXAJ0bYvmJBngLVDWK6nf6GtU/gUKMagCfVewU
L3ZBtx80h+vohhlZos/eERg=
=PvqH
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: check-parents.patch
Type: text/x-patch
Size: 11216 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060921/6fd1b600/attachment.bin