Re: [openstack-dev] [devstack] [neutron] Procedure for back-porting a bug fix to stable/liberty branch of a Neutron script in DevStack?

2016-01-04 Thread Mike Spreitzer 
> From: Kyle Mestery 
> To: "OpenStack Development Mailing List (not for usage questions)" 
> 
> 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  
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://mspre...@review.openstack.org:29418/openstack-dev/devstack.git 
(fetch)
gerrit 
ssh://mspre...@review.openstack.org: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.



__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] [devstack] [neutron] Procedure for back-porting a bug fix to stable/liberty branch of a Neutron script in DevStack?

2016-01-04 Thread Sean Dague 
On 01/04/2016 04:34 PM, Mike Spreitzer wrote:
>> From: Kyle Mestery 
>> To: "OpenStack Development Mailing List (not for usage questions)"
>> 
>> 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 
> 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://mspre...@review.openstack.org:29418/openstack-dev/devstack.git
> (fetch)
> gerrit  
>  ssh://mspre...@review.openstack.org:29418/openstack-dev/devstack.git (push)
> originhttps://github.com/openstack-dev/devstack.git(fetch)
> originhttps://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: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] [devstack] [neutron] Procedure for back-porting a bug fix to stable/liberty branch of a Neutron script in DevStack?

2016-01-04 Thread Sean Dague 
On 01/03/2016 09:23 PM, Kyle Mestery wrote:
> On Sun, Jan 3, 2016 at 5:22 PM, Mike Spreitzer  > wrote:
> 
> > From: Kyle Mestery >
> > To: "OpenStack Development Mailing List (not for usage questions)"
> >  >
> > 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  > 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
> 
> Regarding the mechanics, I was given the following alternate recipe
> in a discussion on #openstack-neutron; I assume it is pretty much
> equivalent.
> 
> "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.

-Sean

-- 
Sean Dague
http://dague.net

__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] [devstack] [neutron] Procedure for back-porting a bug fix to stable/liberty branch of a Neutron script in DevStack?

2016-01-03 Thread Kyle Mestery 
On Sun, Jan 3, 2016 at 5:22 PM, Mike Spreitzer  wrote:

> > From: Kyle Mestery 
> > To: "OpenStack Development Mailing List (not for usage questions)"
> > 
> > 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 
> 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
>
> Regarding the mechanics, I was given the following alternate recipe in a
> discussion on #openstack-neutron; I assume it is pretty much equivalent.
>
> "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.


> Thanks,
> Mike
>
>
> __
> OpenStack Development Mailing List (not for usage questions)
> Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>
>
__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] [devstack] [neutron] Procedure for back-porting a bug fix to stable/liberty branch of a Neutron script in DevStack?

2016-01-03 Thread Mike Spreitzer 
> From: Kyle Mestery 
> To: "OpenStack Development Mailing List (not for usage questions)" 
> 
> 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  
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

Regarding the mechanics, I was given the following alternate recipe in a 
discussion on #openstack-neutron; I assume it is pretty much equivalent.

"do something like 'git checkout -b libery/backport/### 
remotes/origin/stable/liberty' then 'git pull' then 'git review -X ###' 
then push it for review"

Thanks,
Mike


__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

[openstack-dev] [devstack] [neutron] Procedure for back-porting a bug fix to stable/liberty branch of a Neutron script in DevStack?

2016-01-03 Thread Mike Spreitzer 
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.html does not 
specifically address this case.  What is the procedure to follow?

Thanks,
Mike

__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] [devstack] [neutron] Procedure for back-porting a bug fix to stable/liberty branch of a Neutron script in DevStack?

2016-01-03 Thread Kyle Mestery 
On Sun, Jan 3, 2016 at 4:01 PM, Mike Spreitzer  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


> Thanks,
> Mike
>
> __
> OpenStack Development Mailing List (not for usage questions)
> Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>
>
__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev