2011/5/20 Will Dicharry :
> Hi,
>
> From the documentation at http://www.cmake.org/Wiki/CMake/Git#Topic_Stage
> and at http://public.kitware.com/Wiki/Git/Workflow/Stage it's not clear to
> me if I need to do anything after merging my topic branch into stage/next in
> order to get my changes into the master CMake branch. There are instructions
> that mention merging into master on the latter link, but I'm not sure if the
> instructions in the former link override those. Either way, I'd like to know
> what the procedure is after merging into next but before merging into
> master, as I have a couple of bug fixes that I'd like to publish.
You don't merge to master yourself, Kitware guys do.
If your merge to next did not make some dashboard go red.
Dave, Brad, Bill & co do review (something like every week on tuesday I think)
the change which reached next which deserve to go to master.
>From my experience "which deserve to go to master" is:
- feature/bug fix has been discussed and agreed collectively
- some tests exist or have been added to cover the change
- dashboard are all green
Sometimes you are explicitely asked some question, whether if
the change needs or ought to be merged to master.
If your change merged to next did not make it to master after
the next-->master weekly merge, then ask why and you surely be answered.
I am speaking from my personal experience with the workflow, not
from reading some book of rules :-]
--
Erk
Membre de l'April - « promouvoir et défendre le logiciel libre » -
http://www.april.org
___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
