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

[David Gobbi]

It certainly was convenient that the Gerrit pages showed git commands that
you could cut-and-paste to the terminal in order to checkout or cherry-pick
whatever you were looking at.  The ".zip", ".tar.gz", and "Download as"
links that GitLab provides are kinda useless to developers.

Ken, your fork is public and everyone can see it.  You can fetch a branch
from someone else's fork and push it, with modifications, to your own fork
and ask them to take a look.

The "origin" remote is vtk/vtk, the "gitlab" remote is ken-martin/vtk, and
you could add a remote called "dgobbi" which would be my fork.  So during
collaborations, it will often be necessary to explicitly provide the remote
and the branch name (or HEAD, which means "current branch").

 - David




On Tue, Mar 17, 2015 at 12:48 PM, Ken Martin <ken.martin at kitware.com> wrote:

> I apologize if these are stupid questions but I'm exploring this a tad
> further as it hits on the basic way we will collaborate on a topic and I
> want to make sure I do it the right way.
>
> So basically
>
> 1) Checkout their topic from their fork of VTK (the topic does not exist
> yet
> on other forks right?)
>
> 2) Do some work
>
> Then...
>
> I can push it to their fork if they add me as a developer on their fork.
>
> Can I push it to my fork even though my fork lacks their topic?  Should I?
>
> They cannot fetch it from me unless I push it someplace public that they
> can
> see right? Where would that be? Github?
>
> Thanks!
> Ken
>
> Ken Martin PhD
> Chairman & CFO
> Kitware Inc.
> 28 Corporate Drive
> Clifton Park NY 12065
> ken.martin at kitware.com
> 518 881-4901 (w)
> 518 371-4573 (f)
>
> This communication, including all attachments, contains confidential and
> legally privileged information, and it is intended only for the use of the
> addressee.  Access to this email by anyone else is unauthorized. If you are
> not the intended recipient, any disclosure, copying, distribution or any
> action taken in reliance on it is prohibited and may be unlawful. If you
> received this communication in error please notify us immediately and
> destroy the original message.  Thank you.
>
>
> -----Original Message-----
> From: Brad King [mailto:brad.king at kitware.com]
> Sent: Tuesday, March 17, 2015 2:24 PM
> To: Ken Martin
> Cc: VTK Developers
> Subject: Re: How to update someone else's topic (or create a new topic off
> of theirs)
>
> 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
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20150317/118a9441/attachment.html>