You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Daan Hoogland <da...@gmail.com> on 2014/07/24 18:20:21 UTC
4.4-forward usage
People (especially test developers),
please stop using 4.4-forward and switch to 4.4
If we do a code freeze for 4.4.1 make a new branch per fix, the model
of a -forward branch is fundamentally broken and has cost me a few
hours of merge trouble over the past two months.
thanks,
--
Daan
Re: 4.4-forward usage
Posted by Sebastien Goasguen <ru...@gmail.com>.
On Jul 30, 2014, at 5:13 PM, David Nalley <da...@gnsa.us> wrote:
> On Wed, Jul 30, 2014 at 4:26 PM, Daan Hoogland <da...@gmail.com>
> wrote:
>
>> On Wed, Jul 30, 2014 at 10:15 PM, Sebastien Goasguen <ru...@gmail.com>
>> wrote:
>>> and merge it in other needed branches (master and develop)
>>
>>
>> that part will be hard as it will merge all commits (also hotfixes and
>> others) that aren't on the the ancestry of the branch to merge into.
>> So this is only possible if the 4.4 branch is relatively clean.
>>
>>
>>
> Agreed - in many respects the rate of change almost dictates that we'll end
> up with multiple release branches. I worry it's a bit naive to think that
> something as complicated and large as CloudStack, and moving at the
> velocity we do, will end up with only one set of 'master and develop'
>
I don't think cloudstack is that special. But let's wait to see a proposal to all have a common understanding of how this would work.
Right now we have several threads on the same subject.
> --David
Re: 4.4-forward usage
Posted by David Nalley <da...@gnsa.us>.
On Wed, Jul 30, 2014 at 4:26 PM, Daan Hoogland <da...@gmail.com>
wrote:
> On Wed, Jul 30, 2014 at 10:15 PM, Sebastien Goasguen <ru...@gmail.com>
> wrote:
> > and merge it in other needed branches (master and develop)
>
>
> that part will be hard as it will merge all commits (also hotfixes and
> others) that aren't on the the ancestry of the branch to merge into.
> So this is only possible if the 4.4 branch is relatively clean.
>
>
>
Agreed - in many respects the rate of change almost dictates that we'll end
up with multiple release branches. I worry it's a bit naive to think that
something as complicated and large as CloudStack, and moving at the
velocity we do, will end up with only one set of 'master and develop'
--David
Re: 4.4-forward usage
Posted by Daan Hoogland <da...@gmail.com>.
On Wed, Jul 30, 2014 at 10:15 PM, Sebastien Goasguen <ru...@gmail.com> wrote:
> and merge it in other needed branches (master and develop)
that part will be hard as it will merge all commits (also hotfixes and
others) that aren't on the the ancestry of the branch to merge into.
So this is only possible if the 4.4 branch is relatively clean.
--
Daan
Re: 4.4-forward usage
Posted by Sebastien Goasguen <ru...@gmail.com>.
On Jul 30, 2014, at 2:38 PM, Mike Tutkowski <mi...@solidfire.com> wrote:
> My understanding is that the -forward concept goes away after 4.4.1.
>
yes +1
instead of asking for a cherry-pick from -forward, folks should ask the RM to merge from their cloudstack-WXYZ branch
and merge it in other needed branches (master and develop)
> On Wednesday, July 30, 2014, Rohit Yadav <ro...@shapeblue.com> wrote:
>
>>
>> On 30-Jul-2014, at 6:11 pm, Daan Hoogland <daan.hoogland@gmail.com
>> <javascript:;>> wrote:
>>
>>> Well Rohit,
>>>
>>> I was thinking we should not use 4.4-forward anymore at all (or create
>>> a new one) Merging back from it at the moment costs to much conflicts.
>>>
>>> I'd say we work on branches taken from 4.4 on a per fix basis and
>>> merge those that are proven.
>>>
>>> makes sense?
>>
>> Yes :)
>>
>> I was asking if we’ll have future -forward branches such as 4.5-forward,
>> 5.0-forward etc or we will never see that kind of workflow again?
>>
>> Regards.
>>
>>>
>>> On Wed, Jul 30, 2014 at 5:37 PM, Rohit Yadav <rohit.yadav@shapeblue.com
>> <javascript:;>> wrote:
>>>> Hi Daan,
>>>>
>>>>
>>>> On 24-Jul-2014, at 6:20 pm, Daan Hoogland <daan.hoogland@gmail.com
>> <javascript:;>> wrote:
>>>>
>>>>> People (especially test developers),
>>>>>
>>>>> please stop using 4.4-forward and switch to 4.4
>>>>>
>>>>> If we do a code freeze for 4.4.1 make a new branch per fix, the model
>>>>> of a -forward branch is fundamentally broken and has cost me a few
>>>>> hours of merge trouble over the past two months.
>>>>
>>>> Since we’re discussing about fixing our git based workflow can we
>> conclude that we should be using the -forward branch in future from now
>> onwards?
>>>>
>>>> So, we work until a release is done (by a tag) and keep working on the
>> same branch instead of a -forward and then cherry-pick, merge it back again
>> to the parent release branch?
>>>>
>>>> Regards.
>>>>
>>>>>
>>>>> thanks,
>>>>> --
>>>>> Daan
>>>>
>>>> Regards,
>>>> Rohit Yadav
>>>> Software Architect, ShapeBlue
>>>> M. +41 779015219 | rohit.yadav@shapeblue.com <javascript:;>
>>>> Blog: bhaisaab.org | Twitter: @_bhaisaab
>>>>
>>>>
>>>>
>>>>
>>>> Find out more about ShapeBlue and our range of CloudStack related
>> services
>>>>
>>>> IaaS Cloud Design & Build<
>> http://shapeblue.com/iaas-cloud-design-and-build//>
>>>> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/
>>>
>>>> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
>>>> CloudStack Infrastructure Support<
>> http://shapeblue.com/cloudstack-infrastructure-support/>
>>>> CloudStack Bootcamp Training Courses<
>> http://shapeblue.com/cloudstack-training/>
>>>>
>>>> This email and any attachments to it may be confidential and are
>> intended solely for the use of the individual to whom it is addressed. Any
>> views or opinions expressed are solely those of the author and do not
>> necessarily represent those of Shape Blue Ltd or related companies. If you
>> are not the intended recipient of this email, you must neither take any
>> action based upon its contents, nor copy or show it to anyone. Please
>> contact the sender if you believe you have received this email in error.
>> Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue
>> Services India LLP is a company incorporated in India and is operated under
>> license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a
>> company incorporated in Brasil and is operated under license from Shape
>> Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of
>> South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is
>> a registered trademark.
>>>
>>>
>>>
>>> --
>>> Daan
>>
>> Regards,
>> Rohit Yadav
>> Software Architect, ShapeBlue
>> M. +41 779015219 | rohit.yadav@shapeblue.com <javascript:;>
>> Blog: bhaisaab.org | Twitter: @_bhaisaab
>>
>>
>>
>>
>> Find out more about ShapeBlue and our range of CloudStack related services
>>
>> IaaS Cloud Design & Build<
>> http://shapeblue.com/iaas-cloud-design-and-build//>
>> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
>> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
>> CloudStack Infrastructure Support<
>> http://shapeblue.com/cloudstack-infrastructure-support/>
>> CloudStack Bootcamp Training Courses<
>> http://shapeblue.com/cloudstack-training/>
>>
>> This email and any attachments to it may be confidential and are intended
>> solely for the use of the individual to whom it is addressed. Any views or
>> opinions expressed are solely those of the author and do not necessarily
>> represent those of Shape Blue Ltd or related companies. If you are not the
>> intended recipient of this email, you must neither take any action based
>> upon its contents, nor copy or show it to anyone. Please contact the sender
>> if you believe you have received this email in error. Shape Blue Ltd is a
>> company incorporated in England & Wales. ShapeBlue Services India LLP is a
>> company incorporated in India and is operated under license from Shape Blue
>> Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil
>> and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is
>> a company registered by The Republic of South Africa and is traded under
>> license from Shape Blue Ltd. ShapeBlue is a registered trademark.
>>
>
>
> --
> *Mike Tutkowski*
> *Senior CloudStack Developer, SolidFire Inc.*
> e: mike.tutkowski@solidfire.com
> o: 303.746.7302
> Advancing the way the world uses the cloud
> <http://solidfire.com/solution/overview/?video=play>*™*
Re: 4.4-forward usage
Posted by Mike Tutkowski <mi...@solidfire.com>.
My understanding is that the -forward concept goes away after 4.4.1.
On Wednesday, July 30, 2014, Rohit Yadav <ro...@shapeblue.com> wrote:
>
> On 30-Jul-2014, at 6:11 pm, Daan Hoogland <daan.hoogland@gmail.com
> <javascript:;>> wrote:
>
> > Well Rohit,
> >
> > I was thinking we should not use 4.4-forward anymore at all (or create
> > a new one) Merging back from it at the moment costs to much conflicts.
> >
> > I'd say we work on branches taken from 4.4 on a per fix basis and
> > merge those that are proven.
> >
> > makes sense?
>
> Yes :)
>
> I was asking if we’ll have future -forward branches such as 4.5-forward,
> 5.0-forward etc or we will never see that kind of workflow again?
>
> Regards.
>
> >
> > On Wed, Jul 30, 2014 at 5:37 PM, Rohit Yadav <rohit.yadav@shapeblue.com
> <javascript:;>> wrote:
> >> Hi Daan,
> >>
> >>
> >> On 24-Jul-2014, at 6:20 pm, Daan Hoogland <daan.hoogland@gmail.com
> <javascript:;>> wrote:
> >>
> >>> People (especially test developers),
> >>>
> >>> please stop using 4.4-forward and switch to 4.4
> >>>
> >>> If we do a code freeze for 4.4.1 make a new branch per fix, the model
> >>> of a -forward branch is fundamentally broken and has cost me a few
> >>> hours of merge trouble over the past two months.
> >>
> >> Since we’re discussing about fixing our git based workflow can we
> conclude that we should be using the -forward branch in future from now
> onwards?
> >>
> >> So, we work until a release is done (by a tag) and keep working on the
> same branch instead of a -forward and then cherry-pick, merge it back again
> to the parent release branch?
> >>
> >> Regards.
> >>
> >>>
> >>> thanks,
> >>> --
> >>> Daan
> >>
> >> Regards,
> >> Rohit Yadav
> >> Software Architect, ShapeBlue
> >> M. +41 779015219 | rohit.yadav@shapeblue.com <javascript:;>
> >> Blog: bhaisaab.org | Twitter: @_bhaisaab
> >>
> >>
> >>
> >>
> >> Find out more about ShapeBlue and our range of CloudStack related
> services
> >>
> >> IaaS Cloud Design & Build<
> http://shapeblue.com/iaas-cloud-design-and-build//>
> >> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/
> >
> >> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
> >> CloudStack Infrastructure Support<
> http://shapeblue.com/cloudstack-infrastructure-support/>
> >> CloudStack Bootcamp Training Courses<
> http://shapeblue.com/cloudstack-training/>
> >>
> >> This email and any attachments to it may be confidential and are
> intended solely for the use of the individual to whom it is addressed. Any
> views or opinions expressed are solely those of the author and do not
> necessarily represent those of Shape Blue Ltd or related companies. If you
> are not the intended recipient of this email, you must neither take any
> action based upon its contents, nor copy or show it to anyone. Please
> contact the sender if you believe you have received this email in error.
> Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue
> Services India LLP is a company incorporated in India and is operated under
> license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a
> company incorporated in Brasil and is operated under license from Shape
> Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of
> South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is
> a registered trademark.
> >
> >
> >
> > --
> > Daan
>
> Regards,
> Rohit Yadav
> Software Architect, ShapeBlue
> M. +41 779015219 | rohit.yadav@shapeblue.com <javascript:;>
> Blog: bhaisaab.org | Twitter: @_bhaisaab
>
>
>
>
> Find out more about ShapeBlue and our range of CloudStack related services
>
> IaaS Cloud Design & Build<
> http://shapeblue.com/iaas-cloud-design-and-build//>
> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
> CloudStack Infrastructure Support<
> http://shapeblue.com/cloudstack-infrastructure-support/>
> CloudStack Bootcamp Training Courses<
> http://shapeblue.com/cloudstack-training/>
>
> This email and any attachments to it may be confidential and are intended
> solely for the use of the individual to whom it is addressed. Any views or
> opinions expressed are solely those of the author and do not necessarily
> represent those of Shape Blue Ltd or related companies. If you are not the
> intended recipient of this email, you must neither take any action based
> upon its contents, nor copy or show it to anyone. Please contact the sender
> if you believe you have received this email in error. Shape Blue Ltd is a
> company incorporated in England & Wales. ShapeBlue Services India LLP is a
> company incorporated in India and is operated under license from Shape Blue
> Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil
> and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is
> a company registered by The Republic of South Africa and is traded under
> license from Shape Blue Ltd. ShapeBlue is a registered trademark.
>
--
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the cloud
<http://solidfire.com/solution/overview/?video=play>*™*
Re: 4.4-forward usage
Posted by Rohit Yadav <ro...@shapeblue.com>.
On 30-Jul-2014, at 6:11 pm, Daan Hoogland <da...@gmail.com> wrote:
> Well Rohit,
>
> I was thinking we should not use 4.4-forward anymore at all (or create
> a new one) Merging back from it at the moment costs to much conflicts.
>
> I'd say we work on branches taken from 4.4 on a per fix basis and
> merge those that are proven.
>
> makes sense?
Yes :)
I was asking if we’ll have future -forward branches such as 4.5-forward, 5.0-forward etc or we will never see that kind of workflow again?
Regards.
>
> On Wed, Jul 30, 2014 at 5:37 PM, Rohit Yadav <ro...@shapeblue.com> wrote:
>> Hi Daan,
>>
>>
>> On 24-Jul-2014, at 6:20 pm, Daan Hoogland <da...@gmail.com> wrote:
>>
>>> People (especially test developers),
>>>
>>> please stop using 4.4-forward and switch to 4.4
>>>
>>> If we do a code freeze for 4.4.1 make a new branch per fix, the model
>>> of a -forward branch is fundamentally broken and has cost me a few
>>> hours of merge trouble over the past two months.
>>
>> Since we’re discussing about fixing our git based workflow can we conclude that we should be using the -forward branch in future from now onwards?
>>
>> So, we work until a release is done (by a tag) and keep working on the same branch instead of a -forward and then cherry-pick, merge it back again to the parent release branch?
>>
>> Regards.
>>
>>>
>>> thanks,
>>> --
>>> Daan
>>
>> Regards,
>> Rohit Yadav
>> Software Architect, ShapeBlue
>> M. +41 779015219 | rohit.yadav@shapeblue.com
>> Blog: bhaisaab.org | Twitter: @_bhaisaab
>>
>>
>>
>>
>> Find out more about ShapeBlue and our range of CloudStack related services
>>
>> IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
>> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
>> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
>> CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
>> CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
>>
>> This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
>
>
>
> --
> Daan
Regards,
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.yadav@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab
Find out more about ShapeBlue and our range of CloudStack related services
IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
Re: 4.4-forward usage
Posted by Daan Hoogland <da...@gmail.com>.
Well Rohit,
I was thinking we should not use 4.4-forward anymore at all (or create
a new one) Merging back from it at the moment costs to much conflicts.
I'd say we work on branches taken from 4.4 on a per fix basis and
merge those that are proven.
makes sense?
On Wed, Jul 30, 2014 at 5:37 PM, Rohit Yadav <ro...@shapeblue.com> wrote:
> Hi Daan,
>
>
> On 24-Jul-2014, at 6:20 pm, Daan Hoogland <da...@gmail.com> wrote:
>
>> People (especially test developers),
>>
>> please stop using 4.4-forward and switch to 4.4
>>
>> If we do a code freeze for 4.4.1 make a new branch per fix, the model
>> of a -forward branch is fundamentally broken and has cost me a few
>> hours of merge trouble over the past two months.
>
> Since we’re discussing about fixing our git based workflow can we conclude that we should be using the -forward branch in future from now onwards?
>
> So, we work until a release is done (by a tag) and keep working on the same branch instead of a -forward and then cherry-pick, merge it back again to the parent release branch?
>
> Regards.
>
>>
>> thanks,
>> --
>> Daan
>
> Regards,
> Rohit Yadav
> Software Architect, ShapeBlue
> M. +41 779015219 | rohit.yadav@shapeblue.com
> Blog: bhaisaab.org | Twitter: @_bhaisaab
>
>
>
>
> Find out more about ShapeBlue and our range of CloudStack related services
>
> IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
> CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
> CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
>
> This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
--
Daan
Re: 4.4-forward usage
Posted by Rohit Yadav <ro...@shapeblue.com>.
Hi Daan,
On 24-Jul-2014, at 6:20 pm, Daan Hoogland <da...@gmail.com> wrote:
> People (especially test developers),
>
> please stop using 4.4-forward and switch to 4.4
>
> If we do a code freeze for 4.4.1 make a new branch per fix, the model
> of a -forward branch is fundamentally broken and has cost me a few
> hours of merge trouble over the past two months.
Since we’re discussing about fixing our git based workflow can we conclude that we should be using the -forward branch in future from now onwards?
So, we work until a release is done (by a tag) and keep working on the same branch instead of a -forward and then cherry-pick, merge it back again to the parent release branch?
Regards.
>
> thanks,
> --
> Daan
Regards,
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.yadav@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab
Find out more about ShapeBlue and our range of CloudStack related services
IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.