[RFC][merge] Patience Sorting Diffs

[Aaron Bentley]

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

John Arbash Meinel wrote:
| I'll check into it more thoroughly, and hopefully I'll find the problem.
| (My best guess is that cdvdifflib.SequenceMatcher is returning blocks
| differently than what is expected, so the alignment of {} and [] is not
| the same. However, in my direct tests of this, it returns the expected
| blocks...)

I'm getting weirdness in Merge3:
abentley at lappy:~/bzr.revision-storage$ ../bzr.patience/bzr merge
../bzr.mpool bzr: ERROR: exceptions.AssertionError:
~  at /home/abentley/bzr.patience/bzrlib/merge3.py line 235
~  in merge_regions

The code in question calls code that calls get_matching_blocks.
Apparently, find_sync_regions is confused enough that it's producing
regions of negative length.

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

iD8DBQFDngo70F+nu1YWqI0RAl2kAJwN08FWZxQu+OCmxl3DOEjWKkx1ewCfcuEH
9SxPWiQt99RxASRDSaNQwSI=
=9mBU
-----END PGP SIGNATURE-----