[MERGE] Nested trees: merge

[Aaron Bentley]

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

Hi all,

This patch adds support for nested trees to merge.  This version works
well when the merge is not across the boundaries of nesting, and may
produce spurious conflicts when boundaries differ between trees.  I
think it is adequate, but leaves room for improvement.  A perfect merge
would probably need to be built on top of a TreeTransform that supports
nested trees directly, and that doesn't exist yet.

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

iEYEARECAAYFAknWTOkACgkQ0F+nu1YWqI3/9wCeNNP/ph4mE+D6q2oxqAuGsOiH
K0MAn3eCxCBlD97MTOgH9mRjcU3O8Q2I
=kURo
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-1923.patch
Type: text/x-patch
Size: 130881 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090403/56d3dbbd/attachment-0001.bin