[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 9459456 3/3: Merge branch 'release-process-lowercas
From: |
Xue Fuqiao |
Subject: |
[Emacs-diffs] master 9459456 3/3: Merge branch 'release-process-lowercase' |
Date: |
Sun, 15 Nov 2015 01:55:58 +0000 |
branch: master
commit 9459456b50dc8dec071dd0106ecbf4c42291057e
Merge: dcd5877 9a4aa0f
Author: Xue Fuqiao <address@hidden>
Commit: Xue Fuqiao <address@hidden>
Merge branch 'release-process-lowercase'
; Rename admin/FOR-RELEASE to admin/release-process and document the
; release process
---
CONTRIBUTE | 8 +-
admin/README | 4 +-
admin/authors.el | 2 +-
admin/notes/bugtracker | 3 +-
admin/notes/versioning | 12 +-
admin/{FOR-RELEASE => release-process} | 281 +++++++++++++++++++-------------
6 files changed, 182 insertions(+), 128 deletions(-)
diff --git a/CONTRIBUTE b/CONTRIBUTE
index 2aae251..2d826e2 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -144,10 +144,10 @@ messages:
"2014-01-16T05:43:address@hidden". Often, "my previous commit"
will suffice.
-- There is no need to mention files such as NEWS, MAINTAINERS, and
- FOR-RELEASE, or to indicate regeneration of files such as
- 'configure', in the ChangeLog entry. "There is no need" means you
- don't have to, but you can if you want to.
+- There is no need to mention files such as NEWS and MAINTAINERS, or
+ to indicate regeneration of files such as 'configure', in the
+ ChangeLog entry. "There is no need" means you don't have to, but
+ you can if you want to.
** Generating ChangeLog entries
diff --git a/admin/README b/admin/README
index 2286e35..b7621ff 100644
--- a/admin/README
+++ b/admin/README
@@ -12,9 +12,9 @@ what you do when using them.
* Instructions and scripts used to prepare an Emacs release.
-** FOR-RELEASE
+** release-process
-Living list of activities that must be completed before the next release.
+The release process used by GNU Emacs.
** make-tarball.txt
diff --git a/admin/authors.el b/admin/authors.el
index 3d7850a..9903218 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -267,7 +267,7 @@ Changes to files matching one of the regexps in this list
are not listed.")
'("external-lisp"
"lock" "share-lib" "local-lisp"
"noleim-Makefile.in"
- "NEWS" "ORDERS" "PROBLEMS" "FAQ" "AUTHORS" "FOR-RELEASE" "TODO" "todo"
+ "NEWS" "ORDERS" "PROBLEMS" "FAQ" "AUTHORS" "release-process" "TODO" "todo"
"MACHINES" "SERVICE"
"README.unicode" "README.multi-tty" "TUTORIAL.translators"
"NEWS.unicode" "COPYING.DJ" "Makefile.old" "Makefile.am"
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index fb65bbe..3d6df03 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:
** To record a bug in the tracker without sending mail to the bug list.
This can be useful to make a note of something discussed on
-emacs-devel that needs fixing. In other words, this can be the
-equivalent of adding something to FOR-RELEASE.
+emacs-devel that needs fixing.
To: address@hidden
[headers end]
diff --git a/admin/notes/versioning b/admin/notes/versioning
index e422b22..ef11335 100644
--- a/admin/notes/versioning
+++ b/admin/notes/versioning
@@ -9,16 +9,20 @@ Emacs version numbers have the form
"build" increments each time Emacs is built in the same location
(without cleaning) and isn't really part of the version.
-bugfix releases increase "minor" by 1.
-non-bugfix releases increase "major" by 1, and reset "minor" to 1.
+Bugfix releases increase "minor" by 1.
+Non-bugfix releases increase "major" by 1, and reset "minor" to 1.
(The division between bugfix and non-bugfix has not always been clear
historically.)
Unreleased (development) versions have an extra "devel" component.
This is a fairly meaningless number that may be unchanged for a long time.
It is normally 50.
-When the release process starts, it changes to 90, 91, ...
-When the actual release is made, this component is removed.
+
+After we cut the release branch, we’ll make pretest and release
+candidate (RC) releases. For pretest releases, the "devel" component
+changes to 90, 91, ... When the first RC release is made, this
+component is removed. Normally, there is one RC release, unless an
+unexpected last-minute problem occurs.
The development version for a new major release has "minor" = 0.
The development version for a new minor release has "minor" = that of
diff --git a/admin/FOR-RELEASE b/admin/release-process
similarity index 67%
rename from admin/FOR-RELEASE
rename to admin/release-process
index 6ecec89..4a0890f 100644
--- a/admin/FOR-RELEASE
+++ b/admin/release-process
@@ -1,7 +1,51 @@
-Tasks needed before the next release.
+This document describes the release process used by GNU Emacs.
+
+* RELEASE CYCLE
+
+Each release cycle will be split into two periods.
+
+** Phase one: development
+
+The first phase of the release schedule is the "heads-down" working
+period for new features, on the `master' branch and several feature
+branches.
+
+** Phase two: bugfixes
+
+Shortly before this phase, Emacs developers will be devoted to
+figuring out what features to include in the next release and what
+features to defer to a later release.
+
+At the beginning of this phase, a release branch called "emacs-NN"
+("NN" represents the major version number of the new Emacs release)
+will be cut from `master'.
+
+This phase is spent fixing bugs and eliminating undocumented new
+features on the "emacs-NN" branch.
+
+In parallel to this phase, `master' can receive new features, to be
+released in the next release cycle. From time to time, the master
+branches merges bugfix commits from the "emacs-NN" branch.
+
+* RELEASE-CRITICAL BUGS
+
+Emacs uses the "blocking bug(s)" feature of Debbugs for bugs need to
+be addressed in the next release.
+
+Currently, bug#19759 is the tracking bug for release of 25.1. Say
+bug#123 needs to be fixed for Emacs 25.1. Send a message to
address@hidden that says:
+
+ block 19759 by 123
+
+Change "block" to "unblock" to unblock the bug.
* TO BE DONE SHORTLY BEFORE RELEASE
+** Make sure the Copyright date reflects the current year in the source
+files. See `admin/notes/years' for information about maintaining
+copyright years for GNU Emacs.
+
** Make sure the necessary sources and scripts for any generated files
are included in the source tarfile. (They don't need to be installed,
so eg admin/ is fine.)
@@ -88,13 +132,13 @@ csplain -output-format=pdf cs-refcard
Emacs 22 translators:
LANG Translator Status
-cs Pavel Janík
-de Sven Joachim
-fr Eric Jacoboni
-pl Włodek Bzyl
-pt-br Rodrigo Real
-ru Alex Ott
-sk Miroslav Vaško
+cs Pavel Janík
+de Sven Joachim
+fr Eric Jacoboni
+pl Włodek Bzyl
+pt-br Rodrigo Real
+ru Alex Ott
+sk Miroslav Vaško
** For a major release, add a "New in Emacs XX" section to faq.texi.
@@ -148,132 +192,139 @@ SECTION READERS
TUTORIAL cyd
TUTORIAL.bg ogi
TUTORIAL.cn xfq
-TUTORIAL.cs
+TUTORIAL.cs
TUTORIAL.de wl
TUTORIAL.eo
-TUTORIAL.es
-TUTORIAL.fr
+TUTORIAL.es
+TUTORIAL.fr
TUTORIAL.he eliz
-TUTORIAL.it
-TUTORIAL.ja
+TUTORIAL.it
+TUTORIAL.ja
TUTORIAL.ko
TUTORIAL.nl Pieter Schoenmakers
-TUTORIAL.pl
-TUTORIAL.pt_BR
+TUTORIAL.pl
+TUTORIAL.pt_BR
TUTORIAL.ro
TUTORIAL.ru Alex Ott
-TUTORIAL.sk
+TUTORIAL.sk
TUTORIAL.sl Primoz PETERLIN
TUTORIAL.sv Mats Lidell
-TUTORIAL.th
+TUTORIAL.th
TUTORIAL.zh
** Check the manual.
-abbrevs.texi
-ack.texi
-anti.texi
-arevert-xtra.texi
-basic.texi
-buffers.texi
-building.texi
-calendar.texi
-cal-xtra.texi
-cmdargs.texi
-commands.texi
-custom.texi
-dired.texi
-dired-xtra.texi
-display.texi
-emacs.texi
-emacs-xtra.texi
-emerge-xtra.texi
-entering.texi
-files.texi
-fixit.texi
-fortran-xtra.texi
-frames.texi
-glossary.texi
-help.texi
-indent.texi
-killing.texi
-kmacro.texi
-macos.texi
-maintaining.texi
-mark.texi
-mini.texi
-misc.texi
-modes.texi
-msdos.texi
-msdos-xtra.texi
-mule.texi
-m-x.texi
-package.texi
-picture-xtra.texi
-programs.texi
-regs.texi
-rmail.texi
-screen.texi
-search.texi
-sending.texi
-text.texi
-trouble.texi
-vc-xtra.texi
-vc1-xtra.texi
-windows.texi
-xresources.texi
+abbrevs.texi
+ack.texi
+anti.texi
+arevert-xtra.texi
+basic.texi
+buffers.texi
+building.texi
+calendar.texi
+cal-xtra.texi
+cmdargs.texi
+commands.texi
+custom.texi
+dired.texi
+dired-xtra.texi
+display.texi
+emacs.texi
+emacs-xtra.texi
+emerge-xtra.texi
+entering.texi
+files.texi
+fixit.texi
+fortran-xtra.texi
+frames.texi
+glossary.texi
+help.texi
+indent.texi
+killing.texi
+kmacro.texi
+macos.texi
+maintaining.texi
+mark.texi
+mini.texi
+misc.texi
+modes.texi
+msdos.texi
+msdos-xtra.texi
+mule.texi
+m-x.texi
+package.texi
+picture-xtra.texi
+programs.texi
+regs.texi
+rmail.texi
+screen.texi
+search.texi
+sending.texi
+text.texi
+trouble.texi
+vc-xtra.texi
+vc1-xtra.texi
+windows.texi
+xresources.texi
** Check the Lisp manual.
-abbrevs.texi
-anti.texi
-back.texi
-backups.texi
-buffers.texi
-commands.texi
-compile.texi
-control.texi
-customize.texi
-debugging.texi
-display.texi
-edebug.texi
+abbrevs.texi
+anti.texi
+back.texi
+backups.texi
+buffers.texi
+commands.texi
+compile.texi
+control.texi
+customize.texi
+debugging.texi
+display.texi
+edebug.texi
elisp.texi
-errors.texi
-eval.texi
-files.texi
-frames.texi
-functions.texi
-hash.texi
-help.texi
-hooks.texi
+errors.texi
+eval.texi
+files.texi
+frames.texi
+functions.texi
+hash.texi
+help.texi
+hooks.texi
index.texi
-internals.texi
-intro.texi
-keymaps.texi
-lists.texi
-loading.texi
-macros.texi
-maps.texi
-markers.texi
-minibuf.texi
-modes.texi
-nonascii.texi
+internals.texi
+intro.texi
+keymaps.texi
+lists.texi
+loading.texi
+macros.texi
+maps.texi
+markers.texi
+minibuf.texi
+modes.texi
+nonascii.texi
numbers.texi Paul Eggert (24.4)
-objects.texi
-os.texi
-package.texi
-positions.texi
-processes.texi
-searching.texi
-sequences.texi
-streams.texi
-strings.texi
-symbols.texi
-syntax.texi
-text.texi
-tips.texi
-variables.texi
-windows.texi
+objects.texi
+os.texi
+package.texi
+positions.texi
+processes.texi
+searching.texi
+sequences.texi
+streams.texi
+strings.texi
+symbols.texi
+syntax.texi
+text.texi
+tips.texi
+variables.texi
+windows.texi
+
+* OTHER INFORMATION
+
+For Emacs's versioning scheme, see `admin/notes/versioning'.
+
+For instructions to create pretest or release tarballs, announcements,
+etc., see `admin/make-tarball.txt'.
Local variables: