Changes between Version 13 and Version 14 of BluePrintVersions


Ignore:
Timestamp:
01/25/10 12:53:41 (12 years ago)
Author:
Dominic König
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • BluePrintVersions

    v13 v14  
    66Version numbering follows the following schema:
    77{{{
    8   [major].[minor].[version]-[branch]-[commit]
     8  [major].[minor].[version].[sub]-[branch]
    99}}}
    1010||major|| Major Release Number, starting with 0 ||
    1111||minor|| Minor Release Number, starting with 1 ||
    12 ||version|| Release Version, even numbers = stable version, odd numbers = development version ||
    13 ||branch|| Name of the branch, omit for main trunk ||
    14 ||commit|| Branch commit number, omit for stable versions ||
     12||version|| Version number of ''main trunk'', even numbers = stable version, odd numbers = development version, starting with 0||
     13||sub|| Version number in ''branches'', even numbers = stable version, odd numbers = development version, starting with 1||
     14||branch|| Name of the branch, omitted for main trunk ||
    1515
    16 '''Stable versions must have their release and version numbers in the bzr commit log.'''
     16'''Stable versions of the trunk must have their release and version numbers in the bzr commit log.'''
    1717
    18   - Bzr commits without release/version number in the commit log are always considered being unstable ("not ready for merge" in branches).
    19   - 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).
    20 == Version Numbers in Branches ==
     18  - Bzr commits without release/version number in the commit log are always considered being unstable.
     19  - Bzr commits with a release and (an even) version number on top of their commit log indicate a stable version.
    2120
    22 The release/version number of a branch follows the main trunk, i.e. it indicates the trunk version it is synchronised with:
    23 
    24  - 0.3.6-vita
    25 
    26 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.
    27 == Version Numbers ==
     21== Version Numbers in Main Trunk ==
    2822
    2923Each new minor release starts with version number 0 in the stable, and 1 in the development version, i.e.:
     
    3731 - new development version will be 0.3.3 (development 0.3.1=>0.3.3)
    3832
     33== Version Numbers in Branches ==
     34
     35The release/version number of a branch follows the main trunk, i.e. it indicates the trunk version it is synchronised with:
     36
     37 - 0.3.6.1-vita
     38
     39uses the code from the 0.3.6 trunk version.
     40
     41  * 0.3.6.1-vita (VITA branch, version 1, code from trunk version 0.3.6) => next version: 0.3.6.2-vita
     42
     43Whenever a branch gets synchronised with the main trunk, the release and trunk version number gets updated:
     44
     45  * 0.3.6.1-vita => Merge with trunk version 0.3.7 => 0.3.7.1-vita
     46
    3947== Examples ==
    4048
     
    4250
    4351{{{
    44 0.3.3-haiti-567
     520.3.3.56-haiti
    4553}}}
    4654 - Major Release: 0
    4755 - Minor Release: 3 ("Banwell")
    48  - Version: 3 (development version)
     56 - Version: 3 (development version of the trunk)
     57 - Branch version 56 (stable)
    4958 - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
    50  - Commit No.: 567
    5159
    5260{{{
    53 0.3.4-haiti
     610.3.4.1-haiti
    5462}}}
    5563 - Major Release: 0
    5664 - Minor Release: 3
    57  - Version: 4 (stable version, no commit number!)
     65 - Version: 4 (stable version of trunk)
     66 - Branch version 1 (unstable)
    5867 - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
    5968