<tt><font size=2>> From: Kyle Mestery <mestery@mestery.com></font></tt><br><tt><font size=2>> To: "OpenStack Development Mailing List
(not for usage questions)" <br>> <openstack-dev@lists.openstack.org></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><br><tt><font size=2>> <br>> On Sun, Jan 3, 2016 at 4:01 PM, Mike Spreitzer <mspreitz@us.ibm.com>
wrote:</font></tt><br><tt><font size=2>> I would like to back-port </font></tt><a href=https://review.openstack.org/#/c/242721/><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---"><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>> docs.openstack.org/infra/manual/developers.htmldoes 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"><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-branches.html#proposing-fixes"><tt><font size=2>http://docs.openstack.org/project-team-guide/stable-branches.html#proposing-fixes</font></tt></a><tt><font size=2><br></font></tt><br><tt><font size=2>Reference [2] says I should</font></tt><br><br><tt><font size=3>        $ git checkout
stable/tango</font></tt><br><br><tt><font size=2>but that doesn't work.  Here is a typescript
of how it goes wrong:</font></tt><br><br><font size=2 face="Menlo-Regular">mjs10:devstack mspreitz$ git status</font><br><font size=2 face="Menlo-Regular">On branch master</font><br><font size=2 face="Menlo-Regular">Your branch is up-to-date with 'origin/master'.</font><br><font size=2 face="Menlo-Regular">nothing to commit, working directory
clean</font><br><br><font size=2 face="Menlo-Regular">mjs10:devstack mspreitz$ git pull</font><br><font size=2 face="Menlo-Regular">Already up-to-date.</font><br><br><font size=2 face="Menlo-Regular">mjs10:devstack mspreitz$ git remote
-v</font><br><font size=2 face="Menlo-Regular">gerrit        ssh://mspreitz@review.openstack.org:29418/openstack-dev/devstack.git
(fetch)</font><br><font size=2 face="Menlo-Regular">gerrit        ssh://mspreitz@review.openstack.org:29418/openstack-dev/devstack.git
(push)</font><br><font size=2 face="Menlo-Regular">origin        </font><a href="https://github.com/openstack-dev/devstack.git"><font size=2 color=blue face="Menlo-Regular">https://github.com/openstack-dev/devstack.git</font></a><font size=2 face="Menlo-Regular">(fetch)</font><br><font size=2 face="Menlo-Regular">origin        </font><a href="https://github.com/openstack-dev/devstack.git"><font size=2 color=blue face="Menlo-Regular">https://github.com/openstack-dev/devstack.git</font></a><font size=2 face="Menlo-Regular">(push)</font><br><br><font size=2 face="Menlo-Regular">mjs10:devstack mspreitz$ git checkout
stable/liberty</font><br><font size=2 face="Menlo-Regular">error: pathspec 'stable/liberty'
did not match any file(s) known to git.</font><br><br><BR>