Changes between Version 5 and Version 6 of BluePrintVersions


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

--

Legend:

Unmodified
Added
Removed
Modified
  • BluePrintVersions

    v5 v6  
    1313||branch|| Name of the branch, omit for main trunk ||
    1414||commit|| Branch commit number, omit for stable versions ||
     15
     16== Version Numbers in Branches ==
     17
     18The release number of a branch follows the main trunk, i.e. it indicates the trunk version it is contributing to:
     19
     20 - 0.3.6-vita
     21
     22is contributing (and synchronises regularly with) trunk version of the 0.3 release. Once the main trunk turned into 0.4, no code from branches with 0.3.x release numbers will be merged into trunk anymore.
     23
     24Version numbers in branches in turn do not have to correlate with the main trunk version, i.e.
     25
     26 - 0.3.24-vita
     27
     28can contribute to 0.3.3 in the main trunk.
     29
     30However, odd version numbers of branches indicate a "not ready for merge", while even numbers indicate "can be merged", i.e.
     31
     32 - 0.3.24-vita can be merged into 0.3.3 trunk, whilst
     33 - 0.3.25-vita is not ready to be merged
    1534
    1635== Version Numbers ==