[merge] robert, aaron, daniel

[Aaron Bentley]

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

John A Meinel wrote:
> Martin Pool wrote:
> 
>>I've merged in Robert's integration branch, which seems to contain much
>>of John's work too, and a couple of outstanding things from Aaron.  
>>
>>Anything else that should go in and hasn't yet, let me know.  Also:
>>should I send mail like this, and what should be in it?  Or would
>>autogenerated mails be better?
>>
> 
> 
> Since I already started adding my ideas in separate threads, here's
> another one.
> 
> Branches without working trees.
> 
> Although I guess there is still some discussion to be done here. I would
> consider putting an underscore prefix before each filename. So that
> nothing ends up conflicting with a potential namespace.
> 
> Or alternatively just using "_bzr".

My latest thinking is:
Instead of having standalone branches, tree-less branches and repo
branches, we can say there's only one kind of branch.  All we need to do
is to ensure that branches, repositories and checkouts can coexist at
the same location.

Then we say a standalone branch is a branch whose repository, branch and
checkout are all in the same location.

But if they become separate objects, it's best to make sure they don't
use controlfiles with the same names.  So, I'd suggest a standalone
branch would look like this:

.bzr/
     README
     branch/
            branch-format
            revision-history
            branch.conf
            (etc)
     checkout/
              branch-location
              checkout-format
              inventory
              pending-merges
              (etc)
     repository/
                repository-format
                inventory.weave
                revision-storage
                (etc)

Treeless branches would then be implemented by just leaving out the
checkout dir.

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

iD8DBQFDfPbn0F+nu1YWqI0RAueDAJ9+uiyAEWVJh/12uX8pbRj0b2GORgCeK8in
xUY/V4fIsBum1oi6vcO3M2c=
=GBHu
-----END PGP SIGNATURE-----