Difference between revisions of "Branch Model"
| Line 2: | Line 2: | ||
= [[OpenStack]] branch model = | = [[OpenStack]] branch model = | ||
| − | Starting with the Diablo cycle, | + | Starting with the Diablo cycle, OpenStack core projects use a branching model close to the [http://nvie.com/posts/a-successful-git-branching-model/ NVIE model] that ensures a continuously-open ''trunk'' while still allowing to freeze features and select bugfixes in a release branch (''milestone-proposed''): |
{{http://img97.imageshack.us/img97/8242/branchmodel.png}} | {{http://img97.imageshack.us/img97/8242/branchmodel.png}} | ||
At some point before the release of a milestone (called the "branch point"), the current state of ''trunk'' is merged into ''milestone-proposed'', and trunk continues towards the development of the next milestone. The ''milestone-proposed'' branches gets testing and bugfixes (that are also backported to ''trunk''), until the release is tagged. | At some point before the release of a milestone (called the "branch point"), the current state of ''trunk'' is merged into ''milestone-proposed'', and trunk continues towards the development of the next milestone. The ''milestone-proposed'' branches gets testing and bugfixes (that are also backported to ''trunk''), until the release is tagged. | ||
Revision as of 12:58, 1 June 2011
OpenStack branch model
Starting with the Diablo cycle, OpenStack core projects use a branching model close to the NVIE model that ensures a continuously-open trunk while still allowing to freeze features and select bugfixes in a release branch (milestone-proposed):
Template:Http://img97.imageshack.us/img97/8242/branchmodel.png
At some point before the release of a milestone (called the "branch point"), the current state of trunk is merged into milestone-proposed, and trunk continues towards the development of the next milestone. The milestone-proposed branches gets testing and bugfixes (that are also backported to trunk), until the release is tagged.
