Re: [openstack-dev] Development workflow for bunch of patches

2017-04-20 Thread Jeremy Stanley
On 2017-04-19 15:48:04 -0700 (-0700), Clark Boylan wrote: [...] > The way I work is to always edit the tip of the series then "squash > back" edits as necessary. > So lets say we already have A <- B <- C and now I want to edit A and > push everything back so that it is up to date. > > To do this

Re: [openstack-dev] Development workflow for bunch of patches

2017-04-19 Thread Clark Boylan
On Wed, Apr 19, 2017, at 01:11 AM, Sławek Kapłoński wrote: > Hello, > > I have a question about how to deal with bunch of patches which depends > one on another. > I did patch to neutron (https://review.openstack.org/#/c/449831/ > ) which is not merged

Re: [openstack-dev] Development workflow for bunch of patches

2017-04-19 Thread Ihar Hrachyshka
Sometimes it's possible to avoid the stacking, and instead just rely on Depends-On (usually in those cases where patches touch completely different files). In that way, you won't need to restack on each dependency respin. (But you may want to recheck to get fresh results.) Of course it won't work

Re: [openstack-dev] Development workflow for bunch of patches

2017-04-19 Thread Ben Nemec
On 04/19/2017 03:11 AM, Sławek Kapłoński wrote: Hello, I have a question about how to deal with bunch of patches which depends one on another. I did patch to neutron (https://review.openstack.org/#/c/449831/) which is not merged yet but I wanted to start also another patch which is depend on

Re: [openstack-dev] Development workflow for bunch of patches

2017-04-19 Thread Eric Fried
I've always used rebase rather than cherry-pick in this situation. Bonus is that sometimes (if no conflicts) I can do the rebase in gerrit with two clicks rather than locally with a bunch of typing. @kevinbenton, is there a benefit to using cherry-pick rather than rebase? Thanks, Eric Fried

Re: [openstack-dev] Development workflow for bunch of patches

2017-04-19 Thread Sławek Kapłoński
Hello, Thanks a lot :) — Best regards Slawek Kaplonski sla...@kaplonski.pl > Wiadomość napisana przez Kevin Benton w dniu 19.04.2017, o > godz. 10:25: > > Whenever you want to work on the second patch you would need to first > checkout the latest version of the first

Re: [openstack-dev] Development workflow for bunch of patches

2017-04-19 Thread Kevin Benton
Whenever you want to work on the second patch you would need to first checkout the latest version of the first patch and then cherry-pick the later patch on top of it. That way when you update the second one it won't affect the first patch. The -R flag can also be used to prevent unexpected

[openstack-dev] Development workflow for bunch of patches

2017-04-19 Thread Sławek Kapłoński
Hello, I have a question about how to deal with bunch of patches which depends one on another. I did patch to neutron (https://review.openstack.org/#/c/449831/ ) which is not merged yet but I wanted to start also another patch which is depend on this