[vtk-developers] How to update someone else's topic (or create a new topic off of theirs)

[Moreland, Kenneth]

For solution number 2 below, is it really necessary to close the original
merge request? Git is pretty good about managing the history DAG. If the
original gets merged first and then the new, the second merge should
include only those commits since the fork. If the the second gets merged
before the original, I would expect git to do a no-op if you tried to
merge the original.


-Ken

On 3/17/15, 12:24 PM, "Brad King" <brad.king at kitware.com> wrote:

>On 03/17/2015 02:16 PM, Ken Martin wrote:
>> So I was doing a review of someone's merge request and I realized it
>>needs
>> some extra changes. Is there a way for me to download their topic
>>(cherry
>> pick?), make some more changes and then resubmit it? I saw lots of
>>options
>> to download a patch or diff for a topic but I do not want to lose their
>> node/hash/whatever it is called. Is there a right way to do this. I did
>> check the wiki but did not see a "revise someone else's topic".
>
>This is an area where GitLab's merge request workflow differs from
>Gerrit's.
>In GitLab the original submitter of the merge request is responsible for
>pushing all updates to the branch.  There are a few options here:
>
>1. You could checkout the branch locally, make the changes, and then ask
>   the original submitter to fetch your version of the topic and
>   'git gitlab-push' it again to update the MR.
>
>2. You could do the same but instead open your own MR and close the
>   original.
>
>3. You could work with the submitter directly in their repository.  They
>   can use the Setting tab in their GitLab fork to make you a developer
>   that can push directly to their repository.  In that case though
>   the 'git gitlab-push' alias won't help you because it won't be
>   configured to push to the right place.  You'd have to push by hand.
>
>-Brad
>
>_______________________________________________
>Powered by www.kitware.com
>
>Visit other Kitware open-source projects at
>http://www.kitware.com/opensource/opensource.html
>
>Search the list archives at: http://markmail.org/search/?q=vtk-developers
>
>Follow this link to subscribe/unsubscribe:
>http://public.kitware.com/mailman/listinfo/vtk-developers
>