[cmake-developers] hot to get something from stage to next or master ?

[David Cole]

On Sun, Nov 14, 2010 at 12:35 PM, Eric Noulard <eric.noulard at gmail.com> wrote:
> 2010/11/14 Alexander Neundorf <neundorf at kde.org>:
>> Hi,
>>
>> the  AddASM_NASMSupport branch (#10069) in staging is now good enough to be
>> merged into next (or master ?).
>>
>> How does that happen ?
>> Should I simply ignore staging and merge my local branch into next and push
>> this ?
>
> I don't know for merging to master, but the main interest of stage
> is to be able to merge directly from stage to next without requiring
> local branch.
>
> What I do (as told by Dave or Brad I did not remember)
>
> 0) I suppose you did read this first:
>    http://www.cmake.org/Wiki/CMake/Git#Topic_Stage
>
> 1) You have your local branch <YourBranch> checked-out from master some time ago
>    You "stage-it" using:
>    git push stage HEAD
>    (But I think you already did that because I can see the branch
>      AddASM_NASMSupport | master=0 next=0)
>
> 2) Then you request stage to merge to next using:
>    ssh git at cmake.org stage cmake merge -b next <YourBranch>
>
> Using this enables you (or anyone else using the stage branch)
> to re-push several time from the staged branch
> and then to next without trouble and it's ease the merge from next to master
> for the guy doing it.
>
>> Or should I ask you to merge that branch into master ?
>> Should I try to merge into master myself ?
>
> For this I don't know.
>
> --
> Erk
> Membre de l'April - « promouvoir et défendre le logiciel libre » -
> http://www.april.org
> _______________________________________________
> cmake-developers mailing list
> cmake-developers at cmake.org
> http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
>


..... what Erk said. :-)


Please use the stage to push your topic branches to.

Then merge them to next *on the stage* and let the dashboards run for
a night with that change.

And then wait until the following Tuesday...

Every Tuesday, Brad and I conduct a "merge stuff to master" session...
We will review the topics that have run on the nightly dashboards
(anything pushed to 'next' prior to Monday night's nightly start time)
and decide which ones are stable enough to include in the next
release. We will merge the changes to master. Nobody else should be
merging anything to master until it is theoretically completely ready
to be in a CMake release.

The stage is the most important part of this new workflow. Apparently
we haven't effectively communicated that to everyone here on the CMake
developers' list. We are using the topics pushed to the stage to
figure out what topics CMake developers are working on and need to be
merged. Please use it. If you bypass the stage, then we have to do git
detective work to figure out what you've pushed to next yourself.
Ideally, all CMake developers will:

1) develop stuff using topic branches (that ultimately originate from
a commit somewhere in 'master's history)
2) push topic branches to the stage when ready for sharing / review /
dashboard testing
3) merge topic branches to 'next' on the stage (merging to 'next'
triggers a run of the Continuous dashboards, and also gets included in
the next 'nightly' run)


Thanks,
David