Merge progress

[Aaron Bentley]

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

I'll be cleaning up the code over the next little while.  A lot of it is
totally irrelevent, like the BaZing tree structure and inventory system.
~ And of what's left, there are some awkward bits to smooth out.

Currently, I've got code that can be used to apply an Arch changeset to
a bzr tree.  Do you think that would be useful?  If not, I'll zap it.

Aaron

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

iD8DBQFCZztL0F+nu1YWqI0RAms2AJ0WRaExU3R8+F5t2wFeSCZvifUvCgCfdahe
rbqQPG5n6PUNY4T70ytwWYs=
=pDLA
-----END PGP SIGNATURE-----