[MERGE] Re: 'bzr remerge' often report about conflict when it is not

[Aaron Bentley]

-----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. When I merge branches I sometimes
> find useful to use diff3 merge-type to 'remerge'.

This is actually a bug with diff3 merging, not remerge.  Here's a patch.
 (The actual fix in just an indent.  Doh!)

(I also tweaked the merge test suite so that test case failures don't
produce extra lock failures.)

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

iD8DBQFFJAET0F+nu1YWqI0RAgWuAJ0TQHz4Q+vdT0bGLkGinYcyVDBTogCdGwJ2
54iSG5eFI6yFbe0jPnYPgns=
=YmMz
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: diff3-conflict-fix.patch
Type: text/x-patch
Size: 3977 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061004/89712ffa/attachment.bin