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 as you may expect in local git checkout because it doesn't know about Depends-On tags, so it's of limited application.
Ihar On Wed, Apr 19, 2017 at 1:11 AM, Sławek Kapłoński <sla...@kaplonski.pl> 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 > this one (https://review.openstack.org/#/c/457816/). > Currently I was trying to do something like: > 1. git review -d <first patch id> > 2. git checkout -b new_branch_for_second_patch > 3. Make second patch, commit all changes > 4. git review <— this will ask me if I really want to push two patches to > gerrit so I answered „yes” > > Everything is easy for me as long as I’m not doing more changes in first > patch. How I should work with it if I let’s say want to change something in > first patch and later I want to make another change to second patch? IIRC > when I tried to do something like that and I made „git review” to push > changes in second patch, first one was also updated (and I lost changes made > for this one in another branch). > How I should work with something like that? Is there any guide about that (I > couldn’t find such)? > > — > Best regards > Slawek Kaplonski > sla...@kaplonski.pl > > > > > __________________________________________________________________________ > OpenStack Development Mailing List (not for usage questions) > Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev > __________________________________________________________________________ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
