[RFC][merge] Patience Sorting Diffs

[Aaron Bentley]

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

John Arbash Meinel wrote:
=
| Try it again, I think I fixed the problem, and I added some asserts to
| make sure things aren't broken.

I've got good news and bad news.  The good news is, on that test it no
longer performs worse than the standard SequenceMatcher for that case.
The bad news is, it performs exactly the same.  The conflicted files are
~ *exactly* the same.

So, I went and reproduced one of the worst conflicts I've had, the first
merge of bzr.dev into bzr.repository, and there I did see a difference.
~ Not a huge one; it looks like patience is selecting slightly different,
but equally valid conflict regions.

I'll email you some tarballs of all the relevent files, but this is the
case where I thought patience would do better, and it's different, at least.

Aaron


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

iD8DBQFDoMmZ0F+nu1YWqI0RAjPKAJ4vXtZmeV2GsEJblkmcJRfXa+buxACcCCZ5
W66lYCV7c71+h2Vxxxt1PnM=
=aZ82
-----END PGP SIGNATURE-----