howto/maintain-git.txt: new version numbering scheme
We wanted to call the upcoming release "Git 1.9", with its maintenance track being "Git 1.9.1", "Git 1.9.2", etc., but various third-party tools are reported to assume that there are at least three dewey-decimal components in our version number. Adjust the plan so that vX.Y.0 are feature releases while vX.Y.Z (Z > 0) are maintenance releases. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 31, 2014 at 15:14 UTC
c7b8cf49850c59d5583d81a30dd7d1f1d18748bf
1 file changed
+11
-7
Documentation/howto/maintain-git.txt
+11
-7
@@ -39,26 +39,26 @@ The policy on Integration is informally mentioned in "A Note
39
from the maintainer" message, which is periodically posted to
40
this mailing list after each feature release is made.
41
42
- - Feature releases are numbered as vX.Y.Z and are meant to
42
+ - Feature releases are numbered as vX.Y.0 and are meant to
43
contain bugfixes and enhancements in any area, including
44
functionality, performance and usability, without regression.
45
46
- One release cycle for a feature release is expected to last for
47
eight to ten weeks.
48
49
- - Maintenance releases are numbered as vX.Y.Z.W and are meant
50
- to contain only bugfixes for the corresponding vX.Y.Z feature
51
- release and earlier maintenance releases vX.Y.Z.V (V < W).
49
+ - Maintenance releases are numbered as vX.Y.Z and are meant
50
+ to contain only bugfixes for the corresponding vX.Y.0 feature
51
+ release and earlier maintenance releases vX.Y.W (W < Z).
52
53
- 'master' branch is used to prepare for the next feature
54
release. In other words, at some point, the tip of 'master'
55
- branch is tagged with vX.Y.Z.
55
+ branch is tagged with vX.Y.0.
56
57
- 'maint' branch is used to prepare for the next maintenance
58
- release. After the feature release vX.Y.Z is made, the tip
58
+ release. After the feature release vX.Y.0 is made, the tip
59
of 'maint' branch is set to that release, and bugfixes will
60
accumulate on the branch, and at some point, the tip of the
61
- branch is tagged with vX.Y.Z.1, vX.Y.Z.2, and so on.
61
+ branch is tagged with vX.Y.1, vX.Y.2, and so on.
62
63
- 'next' branch is used to publish changes (both enhancements
64
and fixes) that (1) have worthwhile goal, (2) are in a fairly
@@ -86,6 +86,10 @@ this mailing list after each feature release is made.
86
users are encouraged to test it so that regressions and bugs
87
are found before new topics are merged to 'master'.
88
89
+Note that before v1.9.0 release, the version numbers used to be
90
+structured slightly differently. vX.Y.Z were feature releases while
91
+vX.Y.Z.W were maintenance releases for vX.Y.Z.
92
+
93
94
A Typical Git Day
95
-----------------