[PATCH] Merge fixes

[Aaron Bentley]

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

I've done some work on the merge code.

There's more of a distinction between inventory adds/removes and file
creation/deletion.  This allows revert to handle dangling inventory ids
properly, and makes some of the code clearer.

Attemts to delete directories that have some non-source contents
produces a warning, not an exception.  The directory and contents are
retained, but the directory becomes unversioned.

Inventory changes are now produced as part of the output of
tree-changing operations, instead of being re-calculated afterward.

Leftover temp directories from failed merges are automatically deleted,
if empty.

All test cases now were pass.

I've attached a cumulative patch, but for the blow-by-blow, see
http://panoramicfeedback.com/opensource/bzr.merge/

Enjoy!

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

iD8DBQFCzBml0F+nu1YWqI0RAj8IAJoDInH7RgQ6YTtRv57cuM3gufiMUwCfRHx4
S5hOhEIzgRecCEBhxKO4grU=
=2Ibd
-----END PGP SIGNATURE-----