cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rohit Yadav <>
Subject Re: must read
Date Fri, 08 Aug 2014 09:59:16 GMT
Another note on this blog/workflow/idea:

Say I’ve a bug for multiple ACS releases, the way our workflow should be to fix it on the
earliest ACS release branch we want to support and then to the next ones, finally on master
and then feature/personal branches. Example, you fix on 4.1, then cherry-pick/fix to 4.2,
then 4.3, 4.4 and finally master. One can use cherry-picking or merge with fast-forward whatever
is applicable.


On 08-Aug-2014, at 10:25 am, Daan Hoogland <> wrote:

> And another thank you:
> <quote>
> Long-running release branches for long-term support
> What are the main long-running branches in this model?
> We have a master branch – which in Subversion (SVN) terms you would
> call trunk – that is stable-ish. It is in a alpha/RC state.
> We have stable release branches for each product release we have to
> ship updates to.
> Commits always are merged upwards from older to newer branches. If a
> fix needs to be applied to stable branch 2.2 for example, a bug fix
> branch is created off the stable branch. First it gets merged back to
> that branch, and then that branch is merged upwards towards master.
> These chains of merges can be several branches long, but this
> operation is almost completely automated.
> </quote>
> I think this most resembles what we want (source: the link about
> atlassian stash from
> Daan
> On Fri, Aug 8, 2014 at 9:46 AM, Daan Hoogland <> wrote:
>> thanks Rohit,
>> I had missed this one. It contains obligatory release management
>> knowledge for every keyboard toucher that is allowed to use git:
>> I think if we all read this and then study  a bit we don't need to
>> discuss or branching model. It will become clear that we are in fact
>> doing almost fine and need only small changes.
>> --
>> Daan
> --
> Daan

Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 |
Blog: | Twitter: @_bhaisaab

Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build<>
CSForge – rapid IaaS deployment framework<>
CloudStack Consulting<>
CloudStack Infrastructure Support<>
CloudStack Bootcamp Training Courses<>

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.

View raw message