On Tue, Aug 31, 2010 at 8:31 AM, Brad King wrote:
> On 08/30/2010 09:07 PM, Miguel A. Figueroa-Villanueva wrote:
<snip>
> FYI, you can use the CMake Topic Stage
>
> http://www.cmake.org/Wiki/CMake/Git#Topic_Stage
>
> to merge to next for you. We use it to keep track of topic
> heads that are not yet in master. After it merges to next the
> topic branch sticks around on the stage until we merge to master.
> Even for merges that contributors have been pushing directly to
> next I've been manually adding stage branches for them to make
> our merges to master easier.
I take it this is the preferred way, right?
I also take it that we are supposed to merge to master in the stage
repo? I mean, from reading the "Finishing a Topic" section:
----
After development of the topic has been finished and it is considered stable.
Merge it to master:
$ ssh g...@public.kitware.com stage repo merge -b master topic-name
Fetching upstream master
Merge branch topic-name
Pushing upstream master
To ../../repo.git
Deleting fully merged topic topic-name (27c71e8) from stage.
----
Or is this something you guys handle?
--Miguel
_______________________________________________
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
