Changes between Version 14 and Version 15 of BluePrintVersions

Timestamp:

01/25/10 12:56:15 (15 years ago)

Author:

Dominic König

Comment:

--

BluePrintVersions

@@ -6 +6 @@
 Version numbering follows the following schema:
 {{{
-  [major].[minor].[version].[sub]-[branch]
+  [major].[minor].[version]-[branch]-[branch-version]
 }}}
 ||major|| Major Release Number, starting with 0 ||
 ||minor|| Minor Release Number, starting with 1 ||
 ||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 ||
+||branch-version|| Version number in ''branches'', even numbers = stable version, odd numbers = development version, starting with 1||
 
 '''Stable versions of the trunk must have their release and version numbers in the bzr commit log.'''
@@ -39 +39 @@
 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
+  * 0.3.6-vita-1 (VITA branch, version 1, code from trunk version 0.3.6) => next version: 0.3.6-vita-2
 
 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
+  * 0.3.6-vita-1 => Merge with trunk version 0.3.7 => 0.3.7-vita-1
 
 == Examples ==
@@ -50 +50 @@
 
 {{{
-0.3.3.56-haiti
+0.3.3-haiti-56
 }}}
  - Major Release: 0
  - Minor Release: 3 ("Banwell")
  - Version: 3 (development version of the trunk)
+ - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
  - Branch version 56 (stable)
- - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
 
 {{{
-0.3.4.1-haiti
+0.3.4-haiti-1
 }}}
  - Major Release: 0
  - Minor Release: 3
  - Version: 4 (stable version of trunk)
+ - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
  - Branch version 1 (unstable)
- - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
 
 {{{