[MERGE][0.15] Hide commands for nested trees.

[Aaron Bentley]

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

Martin Pool wrote:
> On 13/03/07, Robert Collins <robertc at robertcollins.net> wrote:
> ]> > The easiest way is probably to split that kind-detection behaviour
>> > into a different workingtree class, which can remain experimental for
>> > this release.
>> >
>> > Are you confident in keeping join in the non-reference mode or should
>> > we hide that too?
>>
>> I'd rather we dont have a new format here, I think having a new feature
>> which is available by choice (must explicitly upgrade to it), is fine.
>> nested-trees are already implicitly disabled for vanilla knit
>> repositories.
> 
> Just to be clear; Robert changed the kind-detection so that the
> workingtree only considers directories to be subtrees if the
> repository supports subtrees.

> people might use new
> branches for speed, and then hit subtree bugs.  In that case perhaps
> we should have a separate format.

The new branches give tags, append-only history and rebind, in addition
to speed, so people do have an incentive to adopt them.

So I propose we introduce a new commandline format: "branch6" (or
"tags"), which is WT4 + Branch6 + KnitRepo1.  We turn
"dirstate-with-subtrees" into an experimental format for this iteration.

This kills two birds with one stone, because people can use tags without
a watershed, and people won't use subtrees by accident.

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

iD8DBQFF9p/I0F+nu1YWqI0RAtVfAJ4/Q10rt+636nPXImfwRgx0i4nzpQCdGM5n
c1pKE5CG/wA7PHWYTyZE94A=
=NbVQ
-----END PGP SIGNATURE-----