[MERGE] nested-tree polish update 1

[Aaron Bentley]

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

Hi all,

Here's a patch to improve the behavior of bzr with nested trees.

I am submitting it now, because I don't want the patch to grow
unreviewably big, and because the changes are an improvement.  I will be
continuing to work on nested trees.

It allows mv FILENAME DIRECTORY to work between a tree and its subtree.
It allows merge to work from an un-nested tree into a nested one.
It allows export to export subtrees.

It introduces CompositeTree which is a useful compatibility shim for
working with operations (like cmd_export or cmd_mv) that want to operate
on the nested tree set as though it were a single tree.

It introduces NestedTrees, which provides a more minimal and
high-fidelity interface to a set of nested trees, and is used as the
internal state of CompositeTree.

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

iD8DBQFF8yva0F+nu1YWqI0RAgR+AJ95MV/KTiQjvPzyudXCie23X8TEwgCghBCn
S6zxU1wbVotKM8/gVkkOEyc=
=enof
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: nested-trees-1.patch
Type: text/x-patch
Size: 38822 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070310/87095c7b/attachment-0001.bin