Crash while merging in bzr 0.1.1

Aaron Bentley aaron.bentley at utoronto.ca
Mon Oct 24 16:16:49 BST 2005


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

John Arbash Meinel wrote:
> Do you know what the merge is trying to do? It sounds like it is trying
> to modify a deleted file.

To me, it sounds like the branch is missing the old contents of the
cvsignore, i.e. bad upgrade conversion or something.  Since the branch
once contained the cvsignore, it should always contain the texts of the
cvsignore that were committed.

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

iD8DBQFDXPrh0F+nu1YWqI0RAhFZAJ92NiU0ha8BuRgkkxvyYW3wKFzG6wCdGQnB
8Xov16+5Q0H1IuSte/IBScw=
=Z6HK
-----END PGP SIGNATURE-----




More information about the bazaar mailing list