[openstack-dev] [devstack] [neutron] Procedure for back-porting a bug fix to stable/liberty branch of a Neutron script in DevStack?
sean at dague.net
Mon Jan 4 12:50:14 UTC 2016
On 01/03/2016 09:23 PM, Kyle Mestery wrote:
> On Sun, Jan 3, 2016 at 5:22 PM, Mike Spreitzer <mspreitz at us.ibm.com
> <mailto:mspreitz at us.ibm.com>> wrote:
> > From: Kyle Mestery <mestery at mestery.com <mailto:mestery at mestery.com>>
> > To: "OpenStack Development Mailing List (not for usage questions)"
> > <openstack-dev at lists.openstack.org
> <mailto:openstack-dev at lists.openstack.org>>
> > 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 <mspreitz at us.ibm.com <mailto:mspreitz at us.ibm.com>> 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
> <http://docs.openstack.org/infra/manual/developers.htmldoes> not
> > address this case. What is the procedure to follow?
> > The best place to look is in the project team guide ,
> > specifically the section on proposing fixes.
> >  http://docs.openstack.org/project-team-guide/stable-branches.html
> >  http://docs.openstack.org/project-team-guide/stable-
> > branches.html#proposing-fixes
> Regarding the mechanics, I was given the following alternate recipe
> in a discussion on #openstack-neutron; I assume it is pretty much
> "do something like 'git checkout -b libery/backport/###
> remotes/origin/stable/liberty' then 'git pull' then 'git review -X
> ###' then push it for review"
> I think it is, but honestly, "git cherry-pick -x" is pretty simple as
> well and the way I've always done these.
Yeh, git cherry-pick -x is pretty much the way to go.
More information about the OpenStack-dev