[Rock-dev] Update to master/next/stable

[Janosch Machowinski]

Am 30.09.2014 um 15:39 schrieb Raul Dominguez:
> A couple of question about the wiki text
> (http://rock.opendfki.de/wiki/WikiStart/OngoingWork/RockFlavorsOrReleases/How).
>
> First one:
>
> Options 2 and 3 share the same first point in the procedure of making a
> release:
> "Branch all master branches to the release branch/tag ".
>
> Does this mean that the release is generated from the (at release time)
> state of the master branch?
> To me, it would make more sense to generate a release from the most
> stable and documented code we have (i.e. stable).
Yes, rock1408 was generated from master. What is missing in the description
is the release candidate phase. In this phase the stack was tested. Only 
after
there are no known bugs in the release candidate, the release was done.

The goal of this was to have a stable version, which also features a lot 
of new features.
The old stable was more than a year behind master...

>
>
> Second question:
>
> In option 2 is written:
> "Rename the 'stable' flavor to match the release name (supposedly so
> that the ROCK_FLAVOR variable becomes the "right" branch)"
>
> Does this mean that the stable branch is replaced by the release branch
> right after the release branch was generated from master?
No, see above
> Wouldn't that introduce a lot of untested code in the stable branch
> users? What is then with next? I am sure I am misunderstanding this one...
Next was dropped.
Greetings
     Janosch
>
>
> Raúl
>
>
> On 09/29/2014 04:57 PM, Sylvain Joyeux wrote:
>> Another patch that needs to be applied:
>>     https://github.com/rock-core/base-orogen-std/pull/2
>>
>> Sylvain
>>
>> On Mon, Sep 29, 2014 at 11:47 AM, Sylvain Joyeux <bir.sylvain at gmail.com> wrote:
>>> I've created two pull requests, which will obviously need some testing
>>> ... If anyone is interested.
>>>
>>> This is basically the option 3 described here:
>>>     http://rock.opendfki.de/wiki/WikiStart/OngoingWork/RockFlavorsOrReleases/How
>>>
>>> https://github.com/rock-core/package_set/pull/12
>>>     - makes 'stable' track the rock1408 branch
>>>     - makes 'next' an alias for 'stable' (for backward compatibility reasons)
>>>
>>> https://github.com/rock-core/rock-package_set/pull/19
>>>     - updates the rock package set accordingly
>>>
>>> TODO:
>>>    - update the post-commit hook to warn people who commit on the stable branch
>>>
>>> DIFFERENCES WITH THE ROCK1408 BRANCH
>>> -----------------------------------------------------------------------
>>> I've NOT moved any packages from master to stable (unlike rock1408
>>> which moved all master packages to stable). If these PRs get accepted
>>> into the package set, I'll announce on rock-users that maintainers
>>> will have to request it explicitly. Two exceptions:
>>> base/orogen/interfaces and drivers/velodyne_lidar as they were
>>> dependencies of "released packages".
>>>
>>> The non-Rock-branched packages are NOT pinned to a particular commit.
>>> The PR contain the setup code for it, but I need to backport an
>>> autoproj patch to make it work (will do it ASAP).
>>>
>>> People using 'stable' will get switched to the new release next time
>>> we release anything. What I want is that we've ironed out the release
>>> process by then and "pin" them transparently before we release.
>>>
>>> Sylvain
>> _______________________________________________
>> Rock-dev mailing list
>> Rock-dev at dfki.de
>> http://www.dfki.de/mailman/cgi-bin/listinfo/rock-dev


-- 
  Dipl. Inf. Janosch Machowinski
  SAR- & Sicherheitsrobotik

  Universität Bremen
  FB 3 - Mathematik und Informatik
  AG Robotik
  Robert-Hooke-Straße 1
  28359 Bremen, Germany
  
  Zentrale: +49 421 178 45-6611
  
  Besuchsadresse der Nebengeschäftstelle:
  Robert-Hooke-Straße 5
  28359 Bremen, Germany
  
  Tel.:    +49 421 178 45-6614
  Empfang: +49 421 178 45-6600
  Fax:     +49 421 178 45-4150
  E-Mail:  jmachowinski at informatik.uni-bremen.de

  Weitere Informationen: http://www.informatik.uni-bremen.de/robotik