[vtk-developers] Merging an approved gerrit topic

[Bill Lorensen]

I merged yesterday. http://review.source.kitware.com/#change,1979

It is a VTK topic

On Tue, Jul 19, 2011 at 12:25 PM, David Cole <david.cole at kitware.com> wrote:
> Bill,
>
> What merge (pointer to gerrit topic?) are you talking about?
>
> There's a robot that runs periodically and looks for merged changes
> (identified by the change id in the commit message) and automatically
> marks merged gerrit changes as such...
>
> How long has it been since you did the merge?
>
>
> On Tue, Jul 19, 2011 at 11:53 AM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
>> Marcus,
>>
>> I merged according to the wiki page, but my gerrit topic is still open.
>>
>> Bill
>>
>> On Sun, Jul 17, 2011 at 11:12 PM, Marcus D. Hanwell
>> <marcus.hanwell at kitware.com> wrote:
>>> On Sat, Jul 16, 2011 at 4:33 PM, Bill Lorensen <bill.lorensen at gmail.com>
>>> wrote:
>>>>
>>>> Guys,
>>>>
>>>> What is the proper git command to merge a gerrit-approved topic to
>>>> VTK? For ITK we use the alias gerrit-merge. I see that vtk has aliases
>>>> stage-merge-next and stage-merge.
>>>>
>>>> Does it make sense to have a gerrit-merge that does the proper merge?
>>>>
>>> Bill,
>>> I wrote the gerrit-merge alias for ITK. It is itself an alias for,
>>> git stage-push
>>> git stage-merge
>>> These are documented, and used by most VTK developers now. They are the
>>> correct way to merge a topic from gerrit (or any other topic) into VTK
>>> master.
>>> Marcus
>> _______________________________________________
>> Powered by www.kitware.com
>>
>> Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html
>>
>> Follow this link to subscribe/unsubscribe:
>> http://www.vtk.org/mailman/listinfo/vtk-developers
>>
>>
>