[Rock-dev] 'autoproj update' always checks out master branch of autoproj subdir

[Sylvain Joyeux]

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.
-- 
Sylvain Joyeux (Dr.Ing.)
Space & Security Robotics

!!! Achtung, neue Telefonnummer!!!

Standort Bremen:
DFKI GmbH
Robotics Innovation Center
Robert-Hooke-Straße 5
28359 Bremen, Germany

Phone: +49 (0)421 178-454136
Fax:   +49 (0)421 218-454150
E-Mail: robotik at dfki.de

Weitere Informationen: http://www.dfki.de/robotik
-----------------------------------------------------------------------
Deutsches Forschungszentrum fuer Kuenstliche Intelligenz GmbH
Firmensitz: Trippstadter Straße 122, D-67663 Kaiserslautern
Geschaeftsfuehrung: Prof. Dr. Dr. h.c. mult. Wolfgang Wahlster
(Vorsitzender) Dr. Walter Olthoff
Vorsitzender des Aufsichtsrats: Prof. Dr. h.c. Hans A. Aukes
Amtsgericht Kaiserslautern, HRB 2313
Sitz der Gesellschaft: Kaiserslautern (HRB 2313)
USt-Id.Nr.:    DE 148646973
Steuernummer:  19/673/0060/3
-----------------------------------------------------------------------