[MERGE] Support status for nested trees

[Aaron Bentley]

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

Hi all,

This patch implements status support for nested trees.  It builds on my
previous CompositeTree patch.

It uses a CompositeTree when subtrees are present, but otherwise uses
normal trees.  This avoids any potential speed or quality issues for
normal trees.

It also changes some tests to not care about the sort order.  The
alternative would be to implement and guarantee a sort order, but I'm
not sure we want that.

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

iEYEARECAAYFAknU9N0ACgkQ0F+nu1YWqI15KQCdF839T/WxWDFzAyXHPC6P8ls8
uvoAniO3EkNuxcGG2Rl7ubgA+dP8Oq9G
=2FFJ
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: status-1914.patch
Type: text/x-patch
Size: 120483 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090402/f34ae6d2/attachment-0001.bin