Tree Transform passing all tests, plus abuse

[Aaron Bentley]

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

Hi all,

The Tree Transform code is now passing all tests.  That includes the
previously changeset-oriented test_mege_core tests, which I've now
ported over to it.

I have also subjected it to abusive merges, (like merge -r 5..100 to
bzr.dev), and added tests and fixes for the problems this revealed.  It
now handles these abusive cases better than the existing merge code.

I think it is pretty much ready for prime time.

Tree transform features

* A simpler API than the one it replaces
* Easy extension with new merge types
* Separate functions for building, reverting and merging trees (instead
of just using merge)
* Ready for better conflict reporting (to be added when the code for new
formats lands)
* Up-front detection of errors and conflicts, so that operations don't
die halfway through
* Quite a lot of unit tests

Tree transform can be found here:
http://code.aaronbentley.com/bzr/bzr.ttransform/

Please feel free to beat on it.

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

iD8DBQFD7Py/0F+nu1YWqI0RAksUAJ9LbHNzqjjKrisH2QdHkk9hlKUadQCdHvvk
JZR/aPagNlZaL5eDb8TBa9s=
=hdvE
-----END PGP SIGNATURE-----