[BUG] weave conflict handling is broken in bzr 0.6

Aaron Bentley aaron.bentley at utoronto.ca
Sat Oct 29 00:33:45 BST 2005


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

When doing merge --merge-type weave, conflict handling is broken.  If
there is a text conflict in foo, it is renamed to foo.THIS, and a new
foo containing the conflicts is created.  The problem is that the id is
associated with foo.THIS, instead of with foo.

This is fixed in my branch, at revision
abentley at panoramicfeedback.com-20051028194818-1c851625a7c8f6ae

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

iD8DBQFDYrVZ0F+nu1YWqI0RAproAJ0cLK9qS8mGtLi2RM2zrIfe4mkNmgCfYErd
0vHvPe30qopr46+Hw8kkKik=
=rCV3
-----END PGP SIGNATURE-----




More information about the bazaar mailing list