bzr merge fails if deleted contents differ

[Aaron Bentley]

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


John A Meinel wrote:
> I don't really know what the best solution is. Perhaps just rename
> "file.txt" to "file.txt.THIS". But still leave it as deleted.

See the previous thread "attn: abentley Re: [BUG] Merging repositories
with a directory deleted" for a full discussion of the pitfalls of this
conflict type.

> My biggest problem is that I don't know what it did and didn't merge.
> I'm slowly finding different things that it missed. Mostly it didn't add
> newly added files, and so I have to copy them, and their inventory
> entries manually.

Since content changes are done as the first operation, it would also
have missed all renames and deletes.

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

iD8DBQFDOwJh0F+nu1YWqI0RAsbGAJwJUdaUul0mFd3Ja9H7geKxSBDHlwCfWTAk
xGb82epwu6WuYIzRpOUcS6Y=
=CSCW
-----END PGP SIGNATURE-----