[Rock-dev] 'autoproj update' always checks out master branch of autoproj subdir
Peter Soetens
peter at thesourceworks.com
Wed Mar 2 23:19:47 CET 2011
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 ?
Peter
More information about the Rock-dev
mailing list