Changes between Version 12 and Version 13 of BluePrintVersions


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

--

Legend:

Unmodified
Added
Removed
Modified
  • BluePrintVersions

    v12 v13  
    2020== Version Numbers in Branches ==
    2121
    22 The release number of a branch follows the main trunk, i.e. it indicates the trunk version it is contributing to:
     22The release/version number of a branch follows the main trunk, i.e. it indicates the trunk version it is synchronised with:
    2323
    2424 - 0.3.6-vita
    2525
    26 is contributing to the latest development version of the 0.3 release (and synchronises regularly with it).
    27 
    28 Once the main trunk release turned into 0.4, no code from branches with 0.3.x release numbers will be merged into trunk anymore.
    29 
    30 Version numbers in branches in turn do not have to correlate with the main trunk version, i.e.
    31 
    32  - 0.3.24-vita
    33 
    34 can contribute to 0.3.3 in the main trunk.
    35 
    36 However, odd (or no) version numbers of branches indicate a "not ready for merge", while even numbers indicate "can be merged", i.e.
    37 
    38  - 0.3.24-vita can be merged into 0.3.3 trunk, whilst
    39  - 0.3.25-vita is not ready to be merged
    40 
    41 To indicate a "ready for merge", write the release and version numbers of the branch on the top of the bzr commit log.
     26uses 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.
    4227== Version Numbers ==
    4328