I did find one bug during bootstrapping, where the branch (and for that
matter, any VCS options given on the command line) would not be saved
properly. This would lead the first "autoproj update" to checkout master.

Moreover, "autoproj switch-config" is also buggy, as it does not update
the branch as it should.

Now, after rereading your mail, I'm not entirely sure what you are
experiencing.

The autoproj/manifest file does *not* contain the branch of the master
configuration. It only contains definitions for the "package sets" (i.e.
stuff that lies in autoproj/remotes/)

The VCS definition for the master configuration is stored in
autoproj/config.yml. You can edit/change this file yourself, but the
preferred way is to do

autoproj switch-config VCSTYPE VCSURL VCSOPTIONS

As a shortcut, if you only want to change VCS options (as e.g. the
branch), the vcs type and URL can be omitted.

autoproj switch-config branch=toolchain-2.3

It is preferred, as autoproj should restore the old configuration if
checking out the new one fails.

On 03/02/2011 11:19 PM, Peter Soetens wrote:
> There is this chicken-and-egg problem that if you create a branch in your
> autoproj subdir, set the branch: in your manifest.xml file to the name of that
> branch and then do an autoproj update, it will always update the autoproj
> directory to master again, and then bring the other projects in sync, with the
> master's manifest file. Previously, this was not done so, so it's a regression.
>
> Another 'proof' is that if you change the branch in your manifest while
> autoproj is on master, autoproj will stay on that master branch, instead of
> switching itself to that branch.
>
> Becaue of this, the branch tracking proposed here:
> http://www.orocos.org/wiki/orocos/toolchain/using-autoproj
> Is not working either. Ie, the "branch=toolchain-2.1" is ignored since the
> next update brings the autoproj project back to master, which will bring all
> other projects to master as well.
>
> The only 'workaround' is to keep autoproj always at master, and modify your
> manifest file only on that branch.
>
> Is this intended or will there be a workflow that supports branches for the
> autoproj project ?
This should work. I'll have a look

Sorry for having overlooked this after you said that there was a problem
a few weeks/months ago.