diff options
| author | Xue Fuqiao | 2015-11-15 09:35:50 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2015-11-18 08:42:02 +0800 |
| commit | 0b7d791d2799ce2e4477d222d14478a5fc96fbad (patch) | |
| tree | b28fcf5868bbd58853fab30c4a61e50e4f1ac28b /admin/notes | |
| parent | 20b043f97cdbde072b04469bd8f56b57301be34b (diff) | |
| download | emacs-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/bugtracker | 3 | ||||
| -rw-r--r-- | admin/notes/versioning | 12 |
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. |
| 142 | This can be useful to make a note of something discussed on | 142 | This can be useful to make a note of something discussed on |
| 143 | emacs-devel that needs fixing. In other words, this can be the | 143 | emacs-devel that needs fixing. |
| 144 | equivalent of adding something to FOR-RELEASE. | ||
| 145 | 144 | ||
| 146 | To: quiet@debbugs.gnu.org | 145 | To: 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 | ||
| 12 | bugfix releases increase "minor" by 1. | 12 | Bugfix releases increase "minor" by 1. |
| 13 | non-bugfix releases increase "major" by 1, and reset "minor" to 1. | 13 | Non-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 |
| 15 | historically.) | 15 | historically.) |
| 16 | 16 | ||
| 17 | Unreleased (development) versions have an extra "devel" component. | 17 | Unreleased (development) versions have an extra "devel" component. |
| 18 | This is a fairly meaningless number that may be unchanged for a long time. | 18 | This is a fairly meaningless number that may be unchanged for a long time. |
| 19 | It is normally 50. | 19 | It is normally 50. |
| 20 | When the release process starts, it changes to 90, 91, ... | 20 | |
| 21 | When the actual release is made, this component is removed. | 21 | After we cut the release branch, we’ll make pretest and release |
| 22 | candidate (RC) releases. For pretest releases, the "devel" component | ||
| 23 | changes to 90, 91, ... When the first RC release is made, this | ||
| 24 | component is removed. Normally, there is one RC release, unless an | ||
| 25 | unexpected last-minute problem occurs. | ||
| 22 | 26 | ||
| 23 | The development version for a new major release has "minor" = 0. | 27 | The development version for a new major release has "minor" = 0. |
| 24 | The development version for a new minor release has "minor" = that of | 28 | The development version for a new minor release has "minor" = that of |