Branching scheme documentation needs improvement

[James Y Knight]

My svn repository is laid out like this:
trunk/project1
trunk/project2
branches/project1/mytestbranch/project1
branches/project1/mytestbranch/project2
branches/project1/releases/1.0/project1
branches/project1/releases/1.0/project2
branches/project2/whateverbranch/project1
branches/project2/whateverbranch/project2

When I first used bzr-svn, I told it to pull from $SVNREPOS/trunk/project1. Now, when I did this, it chose a branching scheme of "single-trunk/project1" (as shown in ~/.bazaar/subversion.conf). So, now it refuses to pull down any other projects or even other branches of the same project. It recommended that I type "bzr help svn-branching-schemes" and choose a different branching scheme, but this didn't help me, as there are only two options listed there: "trunk", for the /trunk/* layout, and "none" for no branches, just one branch at the root.

Also: This is a per-user configuration variable. So, even if I do find out that there is a branching-scheme I could manually change to in the configuration file, every user would also have to make this same modification to their configuration file. That's not really usable.

[Jelmer Vernooij (jelmer)]

Am Donnerstag, den 16.08.2007, 20:56 +0000 schrieb James Y Knight:
> My svn repository is laid out like this:
> trunk/project1
> trunk/project2
> branches/project1/mytestbranch/project1
> branches/project1/mytestbranch/project2
> branches/project1/releases/1.0/project1
> branches/project1/releases/1.0/project2
> branches/project2/whateverbranch/project1
> branches/project2/whateverbranch/project2
>
> When I first used bzr-svn, I told it to pull from
> $SVNREPOS/trunk/project1. Now, when I did this, it chose a branching
> scheme of "single-trunk/project1" (as shown in
> ~/.bazaar/subversion.conf). So, now it refuses to pull down any other
> projects or even other branches of the same project. It recommended that
> I type "bzr help svn-branching-schemes" and choose a different branching
> scheme, but this didn't help me, as there are only two options listed
> there: "trunk", for the /trunk/* layout, and "none" for no branches,
> just one branch at the root.
You can also list your branches by running 'bzr svn-branching-scheme --set', for example:

bzr.dev svn-branching-scheme --set svn://svn.samba.org/smb-build/

and then enter something like:

trunk/*
branches/project1/mytestbranch/*
branches/project1/releases/*/*
branches/project2/*/*

> Also: This is a per-user configuration variable. So, even if I do find
> out that there is a branching-scheme I could manually change to in the
> configuration file, every user would also have to make this same
> modification to their configuration file. That's not really usable.
This variable can be also be set on the repository (see the 'bzr
svn-branching-scheme' command).

Cheers,

Jelmer

--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

[James Y Knight (foom)]

Aha! Great! I had no idea. I even tried looking at the source code and somehow *still* missed this capability. And then there were the (I guess obsolete) webpages that said bzr-svn only worked with traditional trunk layout.

e.g. from http://bazaar-vcs.org/BzrMigration:
"""
Limitation: At the moment, bzr-svn requires that the structure of the Subversion repository conforms to the branches/tags/trunk convention. Only URLs that are recognised as branch roots by bzr-svn can be checked out.
"""

I guess this bug report is really "The custom branching scheme configuration ability isn't well documented", then.

[Jelmer Vernooij (jelmer)]

Am Samstag, den 25.08.2007, 21:03 +0000 schrieb James Y Knight:
> Aha! Great! I had no idea. I even tried looking at the source code and
> somehow *still* missed this capability. And then there were the (I guess
> obsolete) webpages that said bzr-svn only worked with traditional trunk
> layout.
>
> e.g. from http://bazaar-vcs.org/BzrMigration:
> """
> Limitation: At the moment, bzr-svn requires that the structure of the Subversion repository conforms to the branches/tags/trunk convention. Only URLs that are recognised as branch roots by bzr-svn can be checked out.
> """
Whoops, I'd missed that. Fixed now, thanks!

> I guess this bug report is really "The custom branching scheme
> configuration ability isn't well documented", then.
Yeah, I guess that could be a bit better.

Cheers,

Jelmer

--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

[Jelmer Vernooij (jelmer)]

branching schemes will be going away in the future so I won't bother fixing the docs.