bzr merge fails if deleted contents differ

[Aaron Bentley]

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

John A Meinel wrote:
> I realize this is probably just a place where Aaron didn't know what the
> correct method was, but I'm trying to merge my Transport code into the
> bzr.newformat codebase. And when I did so, it did maybe 90% of the work,
> and then raised an exception because I had deleted the "remotebranch.py"
> file, which had been changed in bzr.newformat.

Okay, I've fixed the bug (that it was raising the wrong exception) and
added exception handling for the case where the file differs in THIS and
BASE, but doesn't exist in OTHER.

My apologies, I thought you were talking about the 'differs in BASE and
OTHER but does not exist in BASE case'.

> 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.

For now, I'm creating file.txt.THIS and file.txt.BASE.

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

iD8DBQFDO3ld0F+nu1YWqI0RAlkfAJ9Sff5T6BPZhxRkWA9UA4yt+BB6xgCdEYYI
txT5xmB6S07MjrOwIWoN27I=
=+P7e
-----END PGP SIGNATURE-----