[RFC][merge] Patience Sorting Diffs

[John Arbash Meinel]

Aaron Bentley wrote:
> John Arbash Meinel wrote:
> 
>>>I found a specific bug where I was diffing from "alo:bhi" versus "blo:bhi".
>>>
>>>I'm writing some test cases now, to make sure that code path is tested.
> 
> 
> Ah.  Sounds promising.
> 
> My initial tests were a bit discouraging, as the patience merge
> generated more conflicts (and more conflicted files) than the standard
> merge.  It also deleted / failed to insert one section of OTHER that
> should have been present.
> 
> But that was with an ugly hack to handle the duplicated ranges, and I'm
> still hopeful that the end result will be better.
> 
> Aaron

Try it again, I think I fixed the problem, and I added some asserts to
make sure things aren't broken.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051214/b18a6cad/attachment.pgp