pure python 3-way merge

[John A Meinel]

John A Meinel wrote:

> Martin Pool wrote:
>
>> My bzr tree now has some code in bzrlib.merge3 to do a 3-way text
>> merge in pure Python.  I think(?) this might remove the main external
>> dependency, aside from patch for importing changesets, which I hope we
>> can also fix.  I think it works.  Comments or bug reports are welcome.
>>
>>
>>
> BUG!! In python2.3 merge3.py currently does not write out lines if MINE
> has a tail.

...

> I went ahead and created a patch, which tests for proper 'append'
> functionality, and it turns out that Merge3.merge_lines() does the right
> thing. It seems to be a problem with Merge3.merge_annotated()

Let me attach this patch that I speak of.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge3-append-test.patch
Type: text/x-patch
Size: 2056 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050705/10349109/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050705/10349109/attachment.pgp