[MERGE REVIEW] Weave merge fix

[Martin Pool]

On 21 Mar 2006, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> 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

Perhaps it would be better to rename it to weave_merge_lines_iter() or
some such?

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060322/920b4d58/attachment.pgp