[prev in list] [next in list] [prev in thread] [next in thread] 

List:       vtk-developers
Subject:    Re: [vtk-developers] Cherry picking
From:       Bill Lorensen <bill.lorensen () gmail ! com>
Date:       2015-03-19 14:31:03
Message-ID: CADZJ4hPKKWzGp+ogn3FefQb7J1SQTVFmtbOL7FHM1KMaPKrwhA () mail ! gmail ! com
[Download RAW message or body]

Utkarsh,

That looks good. Thanks.

Bill

On Thu, Mar 19, 2015 at 5:35 AM, Utkarsh Ayachit
<utkarsh.ayachit@kitware.com> wrote:
> Bill,
>
> If adding several remotes is what's keeping you from Berk's
> suggestion, here another alternative:
>
> $ git fetch https://gitlab.kitware.com/$username/$project.git $branch
>
> #To view the changes
> $ git log -p master..FETCH_HEAD
>
> # To cherry-pick the changes.
> $ git cherry-pick master..FETCH_HEAD
>
>
> This can be done on a single line too, similar to what Gerrit used to do:
>
> $ git fetch https://gitlab.kitware.com/$username/$project.git $branch
> && git cherry-pick master..FETCH_HEAD
>
> Utkarsh
>
> On Wed, Mar 18, 2015 at 11:01 PM, Bill Lorensen <bill.lorensen@gmail.com> wrote:
>> Actually, I prefer downloading email patches and then
>>
>> git am "the-patch"
>>
>> Then I won't clutter up my machines with all of those fetched repos.
>>
>>
>> On Wed, Mar 18, 2015 at 7:41 AM, Bill Lorensen <bill.lorensen@gmail.com> wrote:
>>> I'll have to try it. For now, downloading the patch seems to work.
>>>
>>> On Wed, Mar 18, 2015 at 5:57 AM, Berk Geveci <berk.geveci@kitware.com> wrote:
>>>> I am sorry because I am probably about to ask something stupid. Isn't this
>>>> what you want Bill?
>>>>
>>>>   $ git remote add gl/$username
>>>> https://gitlab.kitware.com/$username/$project.git
>>>>   $ git fetch gl/$username
>>>>   $ git log -p master..gl/$username/$branch       # view changes
>>>>   $ git cherry-pick master..gl/$username/$branch  # apply changes
>>>>
>>>> This looks identical to the Gerrit workflow where you fetch and cherry-pick
>>>> or rebase. Once you fetch from a particular branch, you should be able to do
>>>> anything with it without fully updating to that branch?
>>>>
>>>> -berk
>>>>
>>>>
>>>> On Tue, Mar 17, 2015 at 5:27 PM, Bill Lorensen <bill.lorensen@gmail.com>
>>>> wrote:
>>>>>
>>>>> I think I can download patches and use them in a new branch.
>>>>>
>>>>>
>>>>> On Tue, Mar 17, 2015 at 2:18 PM, Will Schroeder
>>>>> <will.schroeder@kitware.com> wrote:
>>>>> > I agree with Utkarsh. My old brain cells are definitely grumbling at the
>>>>> > moment since all I want to do is write algorithms and not jump through
>>>>> > hoops
>>>>> > ;-) but with enough feedback and the smarts of this community I believe
>>>>> > that
>>>>> > we will make this work. After all we eventually made gerrit work ....
>>>>> >
>>>>> > W
>>>>> >
>>>>> > On Tue, Mar 17, 2015 at 5:10 PM, Utkarsh Ayachit
>>>>> > <utkarsh.ayachit@kitware.com> wrote:
>>>>> >>
>>>>> >> > I will give it a try. But I suspect my contributions will drop off.
>>>>> >>
>>>>> >> That'd be a shame! I am sure we can come up with an alias or something
>>>>> >> that'd make this easier -- let's give it a little time to settle.
>>>>> >> There's work happening behind the screens for moving ParaView to
>>>>> >> gitlab. Once that's live and well, we can focus on ironing out these
>>>>> >> kinks.
>>>>> >>
>>>>> >> Utkarsh
>>>>> >> _______________________________________________
>>>>> >> 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
>>>>> >>
>>>>> >
>>>>> >
>>>>> >
>>>>> > --
>>>>> > William J. Schroeder, PhD
>>>>> > Kitware, Inc.
>>>>> > 28 Corporate Drive
>>>>> > Clifton Park, NY 12065
>>>>> > will.schroeder@kitware.com
>>>>> > http://www.kitware.com
>>>>> > (518) 881-4902
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Unpaid intern in BillsBasement at noware dot com
>>>>> _______________________________________________
>>>>> 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
>>>>>
>>>>
>>>
>>>
>>>
>>> --
>>> Unpaid intern in BillsBasement at noware dot com
>>
>>
>>
>> --
>> Unpaid intern in BillsBasement at noware dot com
>> _______________________________________________
>> 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
>>



-- 
Unpaid intern in BillsBasement at noware dot com
_______________________________________________
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

[prev in list] [next in list] [prev in thread] [next in thread]