[MERGE REVIEW] Weave merge fix

[Robert Collins]

On Tue, 2006-03-21 at 23:25 -0500, Aaron Bentley wrote:
> -----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/


+1

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060322/a87728dd/attachment.pgp