On Jul 30, 2014, at 2:38 PM, Mike Tutkowski <mike.tutkow...@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 <rohit.ya...@shapeblue.com> wrote: > >> >> On 30-Jul-2014, at 6:11 pm, Daan Hoogland <daan.hoogl...@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.ya...@shapeblue.com >> <javascript:;>> wrote: >>>> Hi Daan, >>>> >>>> >>>> On 24-Jul-2014, at 6:20 pm, Daan Hoogland <daan.hoogl...@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.ya...@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.ya...@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.tutkow...@solidfire.com > o: 303.746.7302 > Advancing the way the world uses the cloud > <http://solidfire.com/solution/overview/?video=play>*™*
