[MERGE] Stop auto-detecting nested trees

[John Arbash Meinel]

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

Aaron Bentley wrote:
> Hi all,
> 
> This patch changes working tree beheviour so that nested working trees
> are not automatically treated as tree references.  Now, they will be
> treated as tree references if explicitly added that way, and otherwise,
> they will be treated as directories.
> 
> This prevents users from accidentally using nested trees, which are an
> alpha-quality feature.  Previously, they were prevented by the
> repository format, which meant that we had to have a separate repository
> format for nested trees.  So with this patch, we can have a single
> format (i.e. brisbane-core) instead of three variants.
> 
> In the process, I discovered that dirstate.update_entry() was broken wrt
> tree-references-- it would always turn a tree-reference into a
> directory.  This patch fixes this.
> 
> I also fixed a few tests that weren't taking locks before calling
> Tree.kind, and refactored test_nested_specifics slightly.
> 
> Aaron

BB:approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkm3SMkACgkQJdeBCYSNAAOo8wCdHkqfXfmeF2pH0Of5F9P/yybz
fuoAn1C35n2TQcyEdGpE/NubIbkRUsc6
=JP7k
-----END PGP SIGNATURE-----