undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

howto/maintain-git.txt: new version numbering scheme

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2014-01-31 15:14:05 -08:00
parent 2171c0c36f
commit c7b8cf4985
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Documentation/howto/maintain-git.txt
View File

@ -39,26 +39,26 @@ The policy on Integration is informally mentioned in "A Note
from the maintainer" message, which is periodically posted to from the maintainer" message, which is periodically posted to
this mailing list after each feature release is made. this mailing list after each feature release is made.
- Feature releases are numbered as vX.Y.Z and are meant to - Feature releases are numbered as vX.Y.0 and are meant to
contain bugfixes and enhancements in any area, including contain bugfixes and enhancements in any area, including
functionality, performance and usability, without regression. functionality, performance and usability, without regression.
- One release cycle for a feature release is expected to last for - One release cycle for a feature release is expected to last for
eight to ten weeks. eight to ten weeks.
- Maintenance releases are numbered as vX.Y.Z.W and are meant - Maintenance releases are numbered as vX.Y.Z and are meant
to contain only bugfixes for the corresponding vX.Y.Z feature to contain only bugfixes for the corresponding vX.Y.0 feature
release and earlier maintenance releases vX.Y.Z.V (V < W). release and earlier maintenance releases vX.Y.W (W < Z).
- 'master' branch is used to prepare for the next feature - 'master' branch is used to prepare for the next feature
release. In other words, at some point, the tip of 'master' release. In other words, at some point, the tip of 'master'
branch is tagged with vX.Y.Z. branch is tagged with vX.Y.0.
- 'maint' branch is used to prepare for the next maintenance - 'maint' branch is used to prepare for the next maintenance
release. After the feature release vX.Y.Z is made, the tip release. After the feature release vX.Y.0 is made, the tip
of 'maint' branch is set to that release, and bugfixes will of 'maint' branch is set to that release, and bugfixes will
accumulate on the branch, and at some point, the tip of the accumulate on the branch, and at some point, the tip of the
branch is tagged with vX.Y.Z.1, vX.Y.Z.2, and so on. branch is tagged with vX.Y.1, vX.Y.2, and so on.
- 'next' branch is used to publish changes (both enhancements - 'next' branch is used to publish changes (both enhancements
and fixes) that (1) have worthwhile goal, (2) are in a fairly 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.
users are encouraged to test it so that regressions and bugs users are encouraged to test it so that regressions and bugs
are found before new topics are merged to 'master'. are found before new topics are merged to 'master'.
Note that before v1.9.0 release, the version numbers used to be
structured slightly differently. vX.Y.Z were feature releases while
vX.Y.Z.W were maintenance releases for vX.Y.Z.
A Typical Git Day A Typical Git Day
----------------- -----------------