From fde2ddabd5ea748999fd2e5e449a35e7f297f574 Mon Sep 17 00:00:00 2001 From: Simon Newton Date: Mon, 29 Jun 2015 15:52:31 -0700 Subject: [PATCH 1/2] Update the developer doc with information about branches. --- README.developer | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.developer b/README.developer index 82adec1923..49e11ddc42 100644 --- a/README.developer +++ b/README.developer @@ -46,6 +46,29 @@ command can be run within a sub directory to only run a particular set of tests (although you may experience issues with this method, running from the root ola directory is guaranteed to work). +Branches, Versioning & Releases +------------------------------- + +Version numbers take the form MAJOR.MINOR.PATCH. The release lifecycle is: + +- New feature work occurs on the master branch. +- Once the new features are considered stable or enough time has passed, a new + minor release branch will be created, e.g. 0.9. +- The minor release branch will be stablized with bugfixes, these bug fixes + will be merged back into master. +- Once declared stable, a new patch branch 0 will be created e.g. 0.9.0 +- Release specific changes like the version number, debian files etc. will be + pushed to the patch branch. +- The release will occur. +- Changes on the release branch will be merged back into the minor version + branch. +- Bug fixes will continue on the minor version branch, leading to another patch + release. + +What this means for you as a developer is that depending on the scope of your +change, we may request that you merge it into the minor release branch rather +than master. This allows us to get your change out to end uses faster than if +it was merged into master directly. C++ =============================================================================== From 0efad59579315995bfcb37aa7d9f7312e0fcc175 Mon Sep 17 00:00:00 2001 From: Simon Newton Date: Tue, 30 Jun 2015 09:09:19 -0700 Subject: [PATCH 2/2] Fix a readme. --- README.developer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.developer b/README.developer index 49e11ddc42..9fbfd59584 100644 --- a/README.developer +++ b/README.developer @@ -55,7 +55,7 @@ Version numbers take the form MAJOR.MINOR.PATCH. The release lifecycle is: - Once the new features are considered stable or enough time has passed, a new minor release branch will be created, e.g. 0.9. - The minor release branch will be stablized with bugfixes, these bug fixes - will be merged back into master. + will also be merged back into master. - Once declared stable, a new patch branch 0 will be created e.g. 0.9.0 - Release specific changes like the version number, debian files etc. will be pushed to the patch branch.