Changes between Version 12 and Version 13 of BluePrintVersions

Timestamp:

01/25/10 12:42:24 (16 years ago)

Author:

Dominic König

Comment:

--

BluePrintVersions

@@ -20 +20 @@
 == 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:
+The release/version number of a branch follows the main trunk, i.e. it indicates the trunk version it is synchronised with:
 
  - 0.3.6-vita
 
-is contributing to the latest development version of the 0.3 release (and synchronises regularly with it).
-
-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.
-
-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 (or no) 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
-
-To indicate a "ready for merge", write the release and version numbers of the branch on the top of the bzr commit log.
+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.
 == Version Numbers ==