Having "fun" with kind change merges again, probably

[Aaron Bentley]

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

Marius Gedminas wrote:
>No luck:
> 
>   bzr: ERROR: Tree transform is malformed [('non-directory parent',
>   'new-1476'), ('non-directory parent', 'new-1074'), ('non-directory
>   parent', 'new-1091'), ('non-directory parent', 'new-467')]

This looks like some directories that had contents were changed into
symlinks.

If the files are versioned, you will need to move them out of the way.
If they are unversioned, you can just delete them.

Now that we support kind changes, we'll need to improve conflict
resolution to handle this case.  Sorry that the errors are so hard to
decipher.

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

iD8DBQFGCC3G0F+nu1YWqI0RAqy9AJ92ftCdN6EbkcqIgWG/7xkh3DkYAgCeLLLd
QCoti+l/+GRm4b1v73NEY8k=
=cncY
-----END PGP SIGNATURE-----