Changes between Version 5 and Version 6 of BluePrintVersions

Timestamp:

01/25/10 12:23:14 (15 years ago)

Author:

Dominic König

Comment:

--

BluePrintVersions

@@ -13 +13 @@
 ||branch|| Name of the branch, omit for main trunk ||
 ||commit|| Branch commit number, omit for stable versions ||
+
+== Version Numbers in Branches ==
+
+The release number of a branch follows the main trunk, i.e. it indicates the trunk version it is contributing to:
+
+ - 0.3.6-vita
+
+is 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.
+
+Version numbers in branches in turn do not have to correlate with the main trunk version, i.e.
+
+ - 0.3.24-vita
+
+can contribute to 0.3.3 in the main trunk.
+
+However, odd version numbers of branches indicate a "not ready for merge", while even numbers indicate "can be merged", i.e.
+
+ - 0.3.24-vita can be merged into 0.3.3 trunk, whilst
+ - 0.3.25-vita is not ready to be merged
 
 == Version Numbers ==