Changes between Version 14 and Version 15 of BluePrintVersions


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

--

Legend:

Unmodified
Added
Removed
Modified
  • BluePrintVersions

    v14 v15  
    66Version numbering follows the following schema:
    77{{{
    8   [major].[minor].[version].[sub]-[branch]
     8  [major].[minor].[version]-[branch]-[branch-version]
    99}}}
    1010||major|| Major Release Number, starting with 0 ||
    1111||minor|| Minor Release Number, starting with 1 ||
    1212||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||
    1413||branch|| Name of the branch, omitted for main trunk ||
     14||branch-version|| Version number in ''branches'', even numbers = stable version, odd numbers = development version, starting with 1||
    1515
    1616'''Stable versions of the trunk must have their release and version numbers in the bzr commit log.'''
     
    3939uses the code from the 0.3.6 trunk version.
    4040
    41   * 0.3.6.1-vita (VITA branch, version 1, code from trunk version 0.3.6) => next version: 0.3.6.2-vita
     41  * 0.3.6-vita-1 (VITA branch, version 1, code from trunk version 0.3.6) => next version: 0.3.6-vita-2
    4242
    4343Whenever a branch gets synchronised with the main trunk, the release and trunk version number gets updated:
    4444
    45   * 0.3.6.1-vita => Merge with trunk version 0.3.7 => 0.3.7.1-vita
     45  * 0.3.6-vita-1 => Merge with trunk version 0.3.7 => 0.3.7-vita-1
    4646
    4747== Examples ==
     
    5050
    5151{{{
    52 0.3.3.56-haiti
     520.3.3-haiti-56
    5353}}}
    5454 - Major Release: 0
    5555 - Minor Release: 3 ("Banwell")
    5656 - Version: 3 (development version of the trunk)
     57 - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
    5758 - Branch version 56 (stable)
    58  - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
    5959
    6060{{{
    61 0.3.4.1-haiti
     610.3.4-haiti-1
    6262}}}
    6363 - Major Release: 0
    6464 - Minor Release: 3
    6565 - Version: 4 (stable version of trunk)
     66 - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
    6667 - Branch version 1 (unstable)
    67  - Branch: haiti (Haiti Earthquake 2010 Deployment Branch)
    6868
    6969{{{