<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hello,<div class=""><br class=""></div><div class="">Thanks a lot :)<br class=""><div class="">
<div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;"><br class="Apple-interchange-newline">— </div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;">Best regards</div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;">Slawek Kaplonski</div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;"><a href="mailto:slawek@kaplonski.pl" class="">slawek@kaplonski.pl</a></div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class=""><br class=""></div><br class="Apple-interchange-newline">
</div>
<br class=""><div style=""><blockquote type="cite" class=""><div class="">Wiadomość napisana przez Kevin Benton <<a href="mailto:kevin@benton.pub" class="">kevin@benton.pub</a>> w dniu 19.04.2017, o godz. 10:25:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">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.<div class=""><br class=""></div><div class="">The -R flag can also be used to prevent unexpected rebases of the parent patch. More details here:<br class=""><div class=""><br class=""></div><div class=""><a href="https://docs.openstack.org/infra/manual/developers.html#adding-a-dependency" class="">https://docs.openstack.org/infra/manual/developers.html#adding-a-dependency</a><br class=""></div></div></div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Wed, Apr 19, 2017 at 1:11 AM, Sławek Kapłoński <span dir="ltr" class=""><<a href="mailto:slawek@kaplonski.pl" target="_blank" class="">slawek@kaplonski.pl</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word" class="">Hello,<div class=""><br class=""></div><div class="">I have a question about how to deal with bunch of patches which depends one on another.</div><div class="">I did patch to neutron (<a href="https://review.openstack.org/#/c/449831/" target="_blank" class="">https://review.openstack.org/<wbr class="">#/c/449831/</a>) which is not merged yet but I wanted to start also another patch which is depend on this one (<a href="https://review.openstack.org/#/c/457816/" target="_blank" class="">https://review.openstack.org/<wbr class="">#/c/457816/</a>).</div><div class="">Currently I was trying to do something like:</div><div class="">1. git review -d <first patch id></div><div class="">2. git checkout -b new_branch_for_second_patch</div><div class="">3. Make second patch, commit all changes</div><div class="">4. git review <— this will ask me if I really want to push two patches to gerrit so I answered „yes”</div><div class=""><br class=""></div><div class="">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).</div><div class="">How I should work with something like that? Is there any guide about that (I couldn’t find such)?</div><div class=""><div class=""><div class="">
<div style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><br class="m_-6873189852148133912Apple-interchange-newline">— </div><div style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class="">Best regards</div><div style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class="">Slawek Kaplonski</div><div style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><a href="mailto:slawek@kaplonski.pl" target="_blank" class="">slawek@kaplonski.pl</a></div><div style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><br class=""></div><br class="m_-6873189852148133912Apple-interchange-newline">
</div>
<br class=""></div></div></div><br class="">______________________________<wbr class="">______________________________<wbr class="">______________<br class="">
OpenStack Development Mailing List (not for usage questions)<br class="">
Unsubscribe: <a href="http://OpenStack-dev-request@lists.openstack.org/?subject:unsubscribe" rel="noreferrer" target="_blank" class="">OpenStack-dev-request@lists.<wbr class="">openstack.org?subject:<wbr class="">unsubscribe</a><br class="">
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev" rel="noreferrer" target="_blank" class="">http://lists.openstack.org/<wbr class="">cgi-bin/mailman/listinfo/<wbr class="">openstack-dev</a><br class="">
<br class=""></blockquote></div><br class=""></div>
__________________________________________________________________________<br class="">OpenStack Development Mailing List (not for usage questions)<br class="">Unsubscribe: <a href="mailto:OpenStack-dev-request@lists.openstack.org" class="">OpenStack-dev-request@lists.openstack.org</a>?subject:unsubscribe<br class=""><a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev" class="">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev</a><br class=""></div></blockquote></div><br class=""></div></body></html>