[RFC] proposed user doc for nested trees

[Aaron Bentley]

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

Vincent Ladeuil wrote:
>>>>>> "jam" == John Arbash Meinel <john at arbash-meinel.com> writes:
> 
> <snip/>
> 
>     jam> Or as Stephen hinted, we could add a property to the revision, to
>     jam> indicate whether they were combined or not...
> 
> I'd rather add that to the CB revision.

If the only purpose of it is to decide whether to uncommit in the
containing tree, maybe it should be per-tree data, like shelves.

I think it would be nice if instead of "uncommit", you ran "undo" after
a commit, and undo could consult a per-tree log of operations to decide
what operation to undo.

>     jam> However, I'm pretty sure Aaron is leaning towards forcing there to be
>     jam> local branches for all subtrees. (So even if you did 'bzr co
>     jam> --lightweight .../bzr.dev', you would have a local branch for bzr-svn,
>     jam> rather than a lightweight checkout of lp:bzr-svn.)

No, I didn't mean to apply it to a lightweight checkout of a nested
tree.  I meant it to apply only when we were creating a local branch for
a nested tree, not when we were creating a branch reference.

> I think that point is a very important one and should be clearly
> defined.

Please see http://bazaar-vcs.org/NestedTreesDesign#sub-branches and tell
me if there's more I can do to clarify.

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

iEYEARECAAYFAkoEPu0ACgkQ0F+nu1YWqI0o1ACfZeIf+ZVJnUSYkilEmCNkWk9H
5FQAn3cuwLzhAcWcxp6nfPHK573Pdzwl
=plJI
-----END PGP SIGNATURE-----