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 _______________________________________________ OpenStack-Infra mailing list OpenStack-Infra@lists.openstack.org http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra
