Hi Hari, You’ve a valid concern, but on master when we’re pushing bugfixes for multiple issues the RM eventually picks them to release branch anyway.
At the end of the day, usage of automated tests, build/unit tests will ensure some quality control. This proposal will solve issues for RM (the cherry-pick and losing commits ones) and it does not do much about code quality or control. To get it working: - During codefreeze, a contributor should not slip in half baked features and use bugfix as an excuse to finish/fix the feature - On the release branch you work first, fix/commit only bug/fixes and release specific enhancements (such as docs, config files, scripts, packaging etc.) - Master branch is free and you can do wild development, merge your feature branch that did not went in release etc. but you merge —fast-forward the release branch on it often (couple of times a day is recommended), fix conflicts and carry on Cheers. On 07-Aug-2014, at 2:51 pm, Harikrishna Patnala <harikrishna.patn...@citrix.com> wrote: > Hi Rohit, > Thanks for the proposal. > > I’ve some concerns. > If we work directly on release branch only (with out forward branch) I’m not > sure how we control regressions in the release time. > > In case of forward branch cut from the release branch RMs will merge only > critical bug fixes to release branch, where do the non-critical bug fixes go > into ? according to your 2nd statement minor/major bug fixes remain in > forward branch only. > > Thanks, > Harikrishna > > On 07-Aug-2014, at 2:09 pm, Rohit Yadav <rohit.ya...@shapeblue.com> wrote: > >> Hi, >> >> I think the following can solve the cherry-picking problem but it needs >> everyone’s support to work: >> >> - Once a release branch is cut out, all the committers and contributors >> “should” only work on the release branch. It can be discussed if we want to >> work on it directly or branch out on it and work in that branch and have RMs >> to merge that branch on the release branch. IMO if we work directly on the >> release branch we potentially reduce a lot of RM’s work. >> >> - Only (new) feature development and related enhancements/bugfixes can land >> on master directly or merged from their respective branches. >> >> - The RMs or anyone would keep merging the release branch with fast forward >> only on regular basis: >> git checkout master >> git merge --ff <release-branch> >> <fix any conflicts and git commit -as etc.> >> >> This way ‘master' gets all the good stuff from release branch and the >> release branch gets “more attention”. >> >> If we somehow can reduce the release cycle timeline/length, the divergence >> between master and release branches can be potentially less causing less >> conflicts/issues when following the above. >> >> Thoughts, flames? >> >> Regards. >> >> Regards, >> Rohit Yadav >> Software Architect, ShapeBlue >> M. +41 779015219 | rohit.ya...@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. > Regards, Rohit Yadav Software Architect, ShapeBlue M. +41 779015219 | rohit.ya...@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.
