<html><body>
<p><font size="2" face="sans-serif">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.</font><br>
<font size="2" face="sans-serif"><br>
</font><font size="1" face="sans-serif">Le Tian Ren (ÈÎÀÖÌì, \u4efb\u4e50\u5929)<br>
IBM OpenStack Development</font><br>
<font size="1" face="sans-serif">IBM China Systems & Technology Lab<br>
86-21-60922666(T/L: 902-2666)<br>
Building 10, 399 Keyuan Road, Zhangjiang Hi-Tech Park, Pudong New District, Shanghai 201203, China</font><br>
<font size="1" face="sans-serif">=======================================</font><br>
<font size="1" face="sans-serif">* p^2 = 1 (mod 12), when p is a prime and > 3. *</font><br>
<br>
<img width="16" height="16" src="cid:1__=C7BBF66ADFABA2A38f9e8a93df938@cn.ibm.com" border="0" alt="Inactive hide details for "Bailey, Darragh" ---2014/06/12 16:42:40---On 11/06/14 20:39, Jeremy Stanley wrote: > On 2014-06-11 1"><font size="2" color="#424282" face="sans-serif">"Bailey, Darragh" ---2014/06/12 16:42:40---On 11/06/14 20:39, Jeremy Stanley wrote: > On 2014-06-11 18:00:30 +0800 (+0800), Le Tian Ren wrote:</font><br>
<br>
<font size="1" color="#5F5F5F" face="sans-serif">From: </font><font size="1" face="sans-serif">"Bailey, Darragh" <dbailey@hp.com></font><br>
<font size="1" color="#5F5F5F" face="sans-serif">To: </font><font size="1" face="sans-serif">Jeremy Stanley <fungi@yuggoth.org>, Le Tian Ren/China/IBM@IBMCN, </font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Cc: </font><font size="1" face="sans-serif">"retaelppa@gmail.com" <retaelppa@gmail.com>, "openstack-infra@lists.openstack.org" <openstack-infra@lists.openstack.org></font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Date: </font><font size="1" face="sans-serif">2014/06/12 16:42</font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Subject: </font><font size="1" face="sans-serif">Re: [OpenStack-Infra] About openstack branching model and openstack branch stable/icehouse</font><br>
<hr width="100%" size="2" align="left" noshade style="color:#8091A5; "><br>
<br>
<br>
<tt><font size="2"><br>
On 11/06/14 20:39, Jeremy Stanley wrote:<br>
> On 2014-06-11 18:00:30 +0800 (+0800), Le Tian Ren wrote:<br>
>> 2. I noticed that there are stable/icheouse, stable/havana<br>
>> branches on github web GUI of many openstack projects like nova,<br>
>> heat, ironic. To what branches mentioned in the above 2 models can<br>
>> these stable/* mapped, supporting release branches? hot fix<br>
>> branches?<br>
> I would consider them additional separate "master" branches in NVIE<br>
> terminology. They never merge back into the trunk master/develop<br>
> branch, and are purely a parallel continuation of backported fixes<br>
> to previous releases. This provides much cleaner access to reviewed<br>
> and tested backports of bug fixes consumable by downstream<br>
> distributors and deployers, rather than expecting each to do the<br>
> backporting work on their own independently from our developers.<br>
<br>
Although not in the original blog post, the gitflow tool <br>
(</font></tt><tt><font size="2"><a href="https://github.com/nvie/gitflow">https://github.com/nvie/gitflow</a></font></tt><tt><font size="2">) created by nvie (author of said <br>
branching model) provides a more current view of the NVIE branching <br>
model. It includes the idea of "support" branches that are created from <br>
the production branch with the intention of allowing delivery of <br>
critical fixes to supported releases and not just the current production <br>
code.<br>
<br>
The stable branches probably map better to the concept of "support" <br>
branches as the intention is for them to never be merged back and for <br>
only critical fixes to be landed on them.<br>
<br>
Regards,<br>
Darragh Bailey<br>
<br>
</font></tt><br>
</body></html>