On 01/04/2016 04:34 PM, Mike Spreitzer wrote: >> From: Kyle Mestery <[email protected]> >> To: "OpenStack Development Mailing List (not for usage questions)" >> <[email protected]> >> Date: 01/03/2016 02:15 PM >> Subject: Re: [openstack-dev] [devstack] [neutron] Procedure for >> back-porting a bug fix to stable/liberty branch of a Neutron script >> in DevStack? >> >> On Sun, Jan 3, 2016 at 4:01 PM, Mike Spreitzer <[email protected]> > wrote: >> I would like to back-port https://review.openstack.org/#/c/242721/ >> --- which fixed https://bugs.launchpad.net/devstack/+bug/1469596--- >> to stable/liberty. I have contributed to main line development >> before, but not stable branches. I see that http:// >> docs.openstack.org/infra/manual/developers.htmldoes not specifically >> address this case. What is the procedure to follow? > >> The best place to look is in the project team guide [1], >> specifically the section on proposing fixes. >> >> [1] http://docs.openstack.org/project-team-guide/stable-branches.html >> [2] > http://docs.openstack.org/project-team-guide/stable-branches.html#proposing-fixes > > Reference [2] says I should > > $ git checkout stable/tango > > but that doesn't work. Here is a typescript of how it goes wrong: > > mjs10:devstack mspreitz$ git status > On branch master > Your branch is up-to-date with 'origin/master'. > nothing to commit, working directory clean > > mjs10:devstack mspreitz$ git pull > Already up-to-date. > > mjs10:devstack mspreitz$ git remote -v > gerrit > ssh://[email protected]:29418/openstack-dev/devstack.git > (fetch) > gerrit > ssh://[email protected]:29418/openstack-dev/devstack.git (push) > origin https://github.com/openstack-dev/devstack.git(fetch) > origin https://github.com/openstack-dev/devstack.git(push) > > mjs10:devstack mspreitz$ git checkout stable/liberty > error: pathspec 'stable/liberty' did not match any file(s) known to git.
The first time you do this you need to set up a tracking branch: git checkout -t origin/stable/liberty will get you one. https://review.openstack.org/263456 is a proposed doc fix for this. -Sean -- Sean Dague http://dague.net __________________________________________________________________________ OpenStack Development Mailing List (not for usage questions) Unsubscribe: [email protected]?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
