aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes
diff options
context:
space:
mode:
authorXue Fuqiao2015-11-15 09:35:50 +0800
committerXue Fuqiao2015-11-18 08:42:02 +0800
commit0b7d791d2799ce2e4477d222d14478a5fc96fbad (patch)
treeb28fcf5868bbd58853fab30c4a61e50e4f1ac28b /admin/notes
parent20b043f97cdbde072b04469bd8f56b57301be34b (diff)
downloademacs-0b7d791d2799ce2e4477d222d14478a5fc96fbad.tar.gz
emacs-0b7d791d2799ce2e4477d222d14478a5fc96fbad.zip
Backport: Document the release process
* admin/notes/versioning: Add information about RC releases. * admin/release-process: Document the release process. * admin/authors.el (authors-ignored-files): * admin/README: Change FOR-RELEASE to release-process. * CONTRIBUTE: * admin/notes/bugtracker: Don't mention FOR-RELEASE. (cherry picked from commit 9a4aa0f5945a03611ae29c516025dbd353bd26ab)
Diffstat (limited to 'admin/notes')
-rw-r--r--admin/notes/bugtracker3
-rw-r--r--admin/notes/versioning12
2 files changed, 9 insertions, 6 deletions
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index fb65bbe4330..3d6df03d5e7 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -140,8 +140,7 @@ you can add an element to gnus-posting-styles to do this automatically, eg:
140 140
141** To record a bug in the tracker without sending mail to the bug list. 141** To record a bug in the tracker without sending mail to the bug list.
142This can be useful to make a note of something discussed on 142This can be useful to make a note of something discussed on
143emacs-devel that needs fixing. In other words, this can be the 143emacs-devel that needs fixing.
144equivalent of adding something to FOR-RELEASE.
145 144
146To: quiet@debbugs.gnu.org 145To: quiet@debbugs.gnu.org
147[headers end] 146[headers end]
diff --git a/admin/notes/versioning b/admin/notes/versioning
index e422b22e432..ef11335de54 100644
--- a/admin/notes/versioning
+++ b/admin/notes/versioning
@@ -9,16 +9,20 @@ Emacs version numbers have the form
9"build" increments each time Emacs is built in the same location 9"build" increments each time Emacs is built in the same location
10(without cleaning) and isn't really part of the version. 10(without cleaning) and isn't really part of the version.
11 11
12bugfix releases increase "minor" by 1. 12Bugfix releases increase "minor" by 1.
13non-bugfix releases increase "major" by 1, and reset "minor" to 1. 13Non-bugfix releases increase "major" by 1, and reset "minor" to 1.
14(The division between bugfix and non-bugfix has not always been clear 14(The division between bugfix and non-bugfix has not always been clear
15historically.) 15historically.)
16 16
17Unreleased (development) versions have an extra "devel" component. 17Unreleased (development) versions have an extra "devel" component.
18This is a fairly meaningless number that may be unchanged for a long time. 18This is a fairly meaningless number that may be unchanged for a long time.
19It is normally 50. 19It is normally 50.
20When the release process starts, it changes to 90, 91, ... 20
21When the actual release is made, this component is removed. 21After we cut the release branch, we’ll make pretest and release
22candidate (RC) releases. For pretest releases, the "devel" component
23changes to 90, 91, ... When the first RC release is made, this
24component is removed. Normally, there is one RC release, unless an
25unexpected last-minute problem occurs.
22 26
23The development version for a new major release has "minor" = 0. 27The development version for a new major release has "minor" = 0.
24The development version for a new minor release has "minor" = that of 28The development version for a new minor release has "minor" = that of