'bzr remerge' often report about conflict when it is not

Aaron Bentley aaron.bentley at utoronto.ca
Wed Oct 4 14:12:38 BST 2006


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

Alexander Belchenko wrote:
> I notice that command 'bzr remerge' often report about conflict in file
> when in reality there is no conflicts.

> Is this intended behaviour? Why for 'remerge' don't clear conflicts flag
> for successfully remerged files?

Definitely not.  If remerge operates without producing conflicts, then
that file should not be marked as conflicted.

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

iD8DBQFFI7NG0F+nu1YWqI0RAlGqAJsElyfKFg0agJnxkkHNcYxx2GAWigCeOoNv
uMExPCafkQbY/T4+WEwZw0E=
=247Y
-----END PGP SIGNATURE-----




More information about the bazaar mailing list