[MERGE REVIEW] Weave merge fix

[Aaron Bentley]

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

Mea culpa.

The weave merge bug was introduced in the Tree Transform code.  I
thought VersionedFile.weave_merge produced a list of lines.  Nope, it
produces a generator.  I thought that "'<<<<<<< TREE\n' in lines" would
not mutate lines.  Nope, "in" will mutate its input, if it's a generator.

So here's a patch that fixes it, and also fixes the merge content tests.

You can also see it at
http://code.aaronbentley.com/bzr/bzrrepo/bzr.weavemerge/

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

iD8DBQFEINHW0F+nu1YWqI0RAgJSAJ44+qtRuymS9BP/QhRhiuVbMwzbbwCfQlwW
m2WRSIBydN1gushatIvJCd0=
=UkQ0
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: weave-merge-fix.patch
Type: text/x-patch
Size: 1454 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060321/9e31ac86/attachment.bin