[merge] robert, aaron, daniel

[Robert Collins]

On Thu, 2005-11-17 at 15:37 -0600, John A Meinel wrote:
> ... 
> > 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.
> 
> Other than potentially changing .bzr into _bzr I think this is a nice
> layout. We certainly discussed many time what files go with what
> fundamental concept, and this would make it explicit.
> 
> I like it.

So do I, except I want to nuke the .bzr level when there is no tree
present.

So with a tree is:
ROOT/
  .bzr/
    README
    branch/ ...
    checkout/ ...
    repository/ ...

without a tree is:
ROOT/
  README
  branch/ ...
  repository/ ...

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051118/4c2aa41a/attachment.pgp