[MERGE][BUG #328171] 'merge --weave' conflicts on deleted lines

[John Arbash Meinel]

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

It turns out that we had a small bug in how we evaluated the plan for
weave merges. If both sides 'deleted' a line, it was not considered a
change for either side. Instead, it should be considered a change for
'both' sides.

The specific symptom was that if one side deleted a line which the other
modified, it would not cause a conflict. The attached patch fixes this.

Unfortunately, I didn't see an obvious way to fix this for 'LCA' merge,
so we don't have this property with all mergers. If someone else comes
up with a way, then we can fix the expectedFailure.

John
=:->


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkn4iYUACgkQJdeBCYSNAAOClACfZM3NVCzx5kD6xpG15P/PBJ1W
jNUAn17FB0lxAOXYetjn1SiD9AI86+Gt
=MsrW
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: weave_conflict_delete_328171.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20090429/f4f56ce0/attachment.diff