<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Sun, Jan 3, 2016 at 5:22 PM, Mike Spreitzer <span dir="ltr"><<a href="mailto:mspreitz@us.ibm.com" target="_blank">mspreitz@us.ibm.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><tt><font size="2">> From: Kyle Mestery <<a href="mailto:mestery@mestery.com" target="_blank">mestery@mestery.com</a>></font></tt><br><tt><font size="2">> To: "OpenStack Development Mailing List
(not for usage questions)" <br>> <<a href="mailto:openstack-dev@lists.openstack.org" target="_blank">openstack-dev@lists.openstack.org</a>></font></tt><br><tt><font size="2">> Date: 01/03/2016 02:15 PM</font></tt><br><tt><font size="2">> Subject: Re: [openstack-dev] [devstack] [neutron]
Procedure for <br>> back-porting a bug fix to stable/liberty branch of a Neutron script
<br>> in DevStack?</font></tt><span class=""><br><tt><font size="2">> <br>> On Sun, Jan 3, 2016 at 4:01 PM, Mike Spreitzer <<a href="mailto:mspreitz@us.ibm.com" target="_blank">mspreitz@us.ibm.com</a>>
wrote:</font></tt><br><tt><font size="2">> I would like to back-port </font></tt><a href="https://review.openstack.org/#/c/242721/" target="_blank"><tt><font size="2">https://review.openstack.org/#/c/242721/</font></tt></a><tt><font size="2"><br>> --- which fixed </font></tt><a href="https://bugs.launchpad.net/devstack/+bug/1469596---" target="_blank"><tt><font size="2">https://bugs.launchpad.net/devstack/+bug/1469596---</font></tt></a><tt><font size="2"><br>> to stable/liberty.  I have contributed to main line development
<br>> before, but not stable branches.  I see that http://<br>> <a href="http://docs.openstack.org/infra/manual/developers.htmldoes" target="_blank">docs.openstack.org/infra/manual/developers.htmldoes</a> not specifically<br>> address this case.  What is the procedure to follow?<br></font></tt><br><tt><font size="2">> The best place to look is in the project team
guide [1], <br>> specifically the section on proposing fixes.<br>> <br>> [1] </font></tt><a href="http://docs.openstack.org/project-team-guide/stable-branches.html" target="_blank"><tt><font size="2">http://docs.openstack.org/project-team-guide/stable-branches.html</font></tt></a><tt><font size="2"><br>> [2] </font></tt><a href="http://docs.openstack.org/project-team-guide/stable-" target="_blank"><tt><font size="2">http://docs.openstack.org/project-team-guide/stable-</font></tt></a><tt><font size="2"><br>> branches.html#proposing-fixes<br></font></tt><br></span><font face="sans-serif" size="2">Regarding the mechanics, I was given
the following alternate recipe in a discussion on #openstack-neutron; I
assume it is pretty much equivalent.</font><br><br><font size="3">"do something like 'git checkout -b libery/backport/###
remotes/origin/stable/liberty' then 'git pull' then 'git review -X ###'
then push it for review"</font><br><br></blockquote><div>I think it is, but honestly, "git cherry-pick -x" is pretty simple as well and the way I've always done these.<br> <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><font face="sans-serif" size="2">Thanks,<br>Mike</font><br><br><br>__________________________________________________________________________<br>
OpenStack Development Mailing List (not for usage questions)<br>
Unsubscribe: <a href="http://OpenStack-dev-request@lists.openstack.org?subject:unsubscribe" rel="noreferrer" target="_blank">OpenStack-dev-request@lists.openstack.org?subject:unsubscribe</a><br>
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev" rel="noreferrer" target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev</a><br>
<br></blockquote></div><br></div></div>