weave merge removes text before first conflict

[David Allouche]

When using "remerge --merge-type=weave" with a specified conflicted file, the part of the file before the first weave-merge conflict is ignored. If weave merge succeeds without conflict, the resulting file is empty.

I have not checked whether the problem occurs without specified files.

[Aaron Bentley (abentley)]

I can confirm that this applies to merge as well as remerge, so it's not related to having specified files. I have eyeballed the tree transform weave merge code several times, but can see nothing wrong on the transform side.

It can be reproduced by merging bzr.dev (revno 1594) into bzr.ab (revno 1576), which destroys the contents of bzrlib/transport/local.py

[Gustavo Niemeyer (niemeyer)]

I can confirm the bug as well. It destroyed the file content when doing a merge which results in conflicts with traditional 3-way merging, and a successful merge with weave.

The code currently in the bzr.dev branch was tested and doesn't show the same problem.

[Gustavo Niemeyer (niemeyer)]

Dapper's package version 0.8~2006032008 has the problem.

[Jeff Bailey (jbailey)]

Fixed in Dapper bzr_0.8~200603230747-0ubuntu1