Changes between Version 4 and Version 5 of VersionsAndBranching

Timestamp:

08/26/10 10:44:11 (4 years ago)

Author:

dread

Comment:

--

VersionsAndBranching

@@ -25 +25 @@
 == Version numbers ==
 
-We generally have a major and minor version number. e.g. 1.5 It is not decimal, so 1.11 is 'one point eleven', not 'one point one one'.
+We generally have a major and minor version number. e.g. `1.5` Note: it is not a decimal number, simply integers separated by a dot. `1.11` is 'one point eleven', not 'one point one one' and is a later release than `1.2`.
 
 On the `default` branch, when you approach a release, we up the minor version number, and add `a` to indicate alpha, e.g. `1.2a`. There may be further trial states e.g. `1.2b` and `1.2c`, before the final release of `1.2`.
@@ -31 +31 @@
 The final release goes to the metastable and eventually the other branches too, keeping this version number.
 
-Bugfixes may appear on branches, yet by default, the code will keep the same version number. If the fix is warranted enough to be released as a point release, then the version number on `default` is upped (e.g. to 1.2.1), and the change made on other branches that have the fix. ''Note'', because `default` may have other changesets since the release unrelated to the fix, we can't merge from `default` to the branches for either the bugfix or the version number change - use `hg import` and `hg export`.
+Bugfixes may appear on branches, yet by default, the code will keep the same version number. If the fix is warranted enough to be released as a point release, then the version number on `default` is upped (e.g. to `1.2.1`), and the change made on other branches that have the fix. ''Note'', because `default` may have other changesets since the release unrelated to the fix, we can't merge from `default` to the branches for either the bugfix or the version number change - use `hg import` and `hg export`.