Changes between Version 13 and Version 14 of BluePrintVersions

Timestamp:

01/25/10 12:53:41 (15 years ago)

Author:

Dominic König

Comment:

--

BluePrintVersions

@@ -6 +6 @@
 Version numbering follows the following schema:
 {{{
-  [major].[minor].[version]-[branch]-[commit]
+  [major].[minor].[version].[sub]-[branch]
 }}}
 ||major|| Major Release Number, starting with 0 ||
 ||minor|| Minor Release Number, starting with 1 ||
-||version|| Release Version, even numbers = stable version, odd numbers = development version ||
-||branch|| Name of the branch, omit for main trunk ||
-||commit|| Branch commit number, omit for stable versions ||
+||version|| Version number of ''main trunk'', even numbers = stable version, odd numbers = development version, starting with 0||
+||sub|| Version number in ''branches'', even numbers = stable version, odd numbers = development version, starting with 1||
+||branch|| Name of the branch, omitted for main trunk ||
 
-'''Stable versions must have their release and version numbers in the bzr commit log.'''
+'''Stable versions of the trunk must have their release and version numbers in the bzr commit log.'''
 
-  - Bzr commits without release/version number in the commit log are always considered being unstable ("not ready for merge" in branches).
-  - Bzr commits with a release and (an even) version number on top of their commit log indicate a stable version ("ready for merge" in branches).
-== Version Numbers in Branches ==
+  - Bzr commits without release/version number in the commit log are always considered being unstable.
+  - Bzr commits with a release and (an even) version number on top of their commit log indicate a stable version.
 
-The release/version number of a branch follows the main trunk, i.e. it indicates the trunk version it is synchronised with:
-
- - 0.3.6-vita
-
-uses the code from the 0.3.6 trunk version. Hence, if the branch is branched off another branch, it has to use the same version number as the original.
-== Version Numbers ==
+== Version Numbers in Main Trunk ==
 
 Each new minor release starts with version number 0 in the stable, and 1 in the development version, i.e.:
@@ -37 +31 @@
  - new development version will be 0.3.3 (development 0.3.1=>0.3.3)
 
+== Version Numbers in Branches ==
+
+The release/version number of a branch follows the main trunk, i.e. it indicates the trunk version it is synchronised with:
+
+ - 0.3.6.1-vita
+
+uses the code from the 0.3.6 trunk version.
+
+  * 0.3.6.1-vita (VITA branch, version 1, code from trunk version 0.3.6) => next version: 0.3.6.2-vita
+
+Whenever a branch gets synchronised with the main trunk, the release and trunk version number gets updated:
+
+  * 0.3.6.1-vita => Merge with trunk version 0.3.7 => 0.3.7.1-vita
+
 == Examples ==
 
@@ -42 +50 @@
 
 {{{
-0.3.3-haiti-567
+0.3.3.56-haiti
 }}}
  - Major Release: 0
  - Minor Release: 3 ("Banwell")
- - Version: 3 (development version)
+ - Version: 3 (development version of the trunk)
+ - Branch version 56 (stable)
  - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
- - Commit No.: 567
 
 {{{
-0.3.4-haiti
+0.3.4.1-haiti
 }}}
  - Major Release: 0
  - Minor Release: 3
- - Version: 4 (stable version, no commit number!)
+ - Version: 4 (stable version of trunk)
+ - Branch version 1 (unstable)
  - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)