Open Stack

Thanks for sharing the gitflow tool, Bailey, and the "support" branches
concepts in current nvie model, which the original version really needs to
add for long term support products. I also mentioned this in the reply to
Jeremy.

Le Tian Ren (任乐天, \u4efb\u4e50\u5929)
IBM OpenStack Development
IBM China Systems & Technology Lab
86-21-60922666(T/L: 902-2666)
Building 10, 399 Keyuan Road, Zhangjiang Hi-Tech Park, Pudong New District,
Shanghai 201203, China
=======================================
* p^2 = 1 (mod 12), when p is a prime and > 3. *



From:	"Bailey, Darragh" <dbailey at hp.com>
To:	Jeremy Stanley <fungi at yuggoth.org>, Le Tian
            Ren/China/IBM at IBMCN,
Cc:	"retaelppa at gmail.com" <retaelppa at gmail.com>,
            "openstack-infra at lists.openstack.org"
            <openstack-infra at lists.openstack.org>
Date:	2014/06/12 16:42
Subject:	Re: [OpenStack-Infra] About openstack branching model and
            openstack branch stable/icehouse




On 11/06/14 20:39, Jeremy Stanley wrote:
> On 2014-06-11 18:00:30 +0800 (+0800), Le Tian Ren wrote:
>> 2. I noticed that there are stable/icheouse, stable/havana
>> branches on github web GUI of many openstack projects like nova,
>> heat, ironic. To what branches mentioned in the above 2 models can
>> these stable/* mapped, supporting release branches? hot fix
>> branches?
> I would consider them additional separate "master" branches in NVIE
> terminology. They never merge back into the trunk master/develop
> branch, and are purely a parallel continuation of backported fixes
> to previous releases. This provides much cleaner access to reviewed
> and tested backports of bug fixes consumable by downstream
> distributors and deployers, rather than expecting each to do the
> backporting work on their own independently from our developers.

Although not in the original blog post, the gitflow tool
(https://github.com/nvie/gitflow) created by nvie (author of said
branching model) provides a more current view of the NVIE branching
model. It includes the idea of "support" branches that are created from
the production branch with the intention of allowing delivery of
critical fixes to supported releases and not just the current production
code.

The stable branches probably map better to the concept of "support"
branches as the intention is for them to never be merged back and for
only critical fixes to be landed on them.

Regards,
Darragh Bailey

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-infra/attachments/20140616/7264698a/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: graycol.gif
Type: image/gif
Size: 105 bytes
Desc: not available
URL: <http://lists.openstack.org/pipermail/openstack-infra/attachments/20140616/7264698a/attachment-0001.gif>