Working with co-located branches

[Jelmer Vernooij]

On Sun, Apr 08, 2012 at 11:37:27AM +0200, Jelmer Vernooij wrote:
> On Sun, Apr 08, 2012 at 09:56:34AM +0300, Eli Zaretskii wrote:
> > Is there anything in the docs of bzr 2.5.0 that describes how to work
> > with co-located branches introduced with the 2.5 series?  The only
> > thing I see is this short notice in "What's New":

> >   Basic colocated branch support

> >   The UI now has basic support for colocated branches. In full URLs, a
> >   specific colocated branch can be specified using URL path segment
> >   parameters. For example a branch named stronk could be addressed using
> >   http://example.com/path/to/dir,branch=stronk.

> >   The new bzr branches command can be used to list all present branches
> >   in a directory, and indicates what the currently active branch is.

> >   Several commands also accept co-located branch names directly, such as
> >   bzr switch.

> > That's rather minimal.  It would perhaps be enough if the integration
> > were transparent, but it doesn't seem to be.  See, for example, my own
> > difficulties in this thread:

> >   https://lists.ubuntu.com/archives/bazaar/2012q2/074712.html

> > As another example, I cannot find any documentation on how to create a
> > branch co-located with an existing branch.

> > What am I missing?
> Colocated branch support is there, but still pretty basic and
> unpolished. We haven't e.g. added docs for it yet for this reason.

> bzr-git probably shouldn't be encouraging its use yet in a released
> version, and perhaps require a --colocated option to create colocated
> branches. I'll update it to do so, similar to the way this works in
> bzr-svn.
This change has now landed on lp:bzr-git. You need the --colocated
option to 'bzr git-import' for it to create colocated branches.

Cheers,

Jelmer