From: Paul Eggert Date: Thu, 25 Mar 2021 15:26:35 +0000 (-0700) Subject: Merge from origin/emacs-27 X-Git-Tag: emacs-28.0.90~3141 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3980a3ea67de9f9f997b13ce47fd1e6aca361e4;p=emacs.git Merge from origin/emacs-27 291a421c2e * admin/make-tarball.txt: Improve and expand the instructi... 0e4795fc98 Fix preeditarea reporting wrong spot. --- c3980a3ea67de9f9f997b13ce47fd1e6aca361e4 diff --cc admin/make-tarball.txt index 9caf22d7188,65c6e86b1df..418cf91ae29 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@@ -82,15 -79,21 +82,21 @@@ General steps (for each step, check fo Before a release candidate is made, the tasks listed in admin/release-process must be completed. - Set the version number to that of the actual release. Pick a date - about a week from now when you intend to make the release. Use M-x - add-release-logs to add entries to etc/HISTORY and the ChangeLog - file. It's best not to commit these files until the release is - actually made. Merge the entries from (unversioned) ChangeLog - into the top of the current versioned ChangeLog.N and commit that - along with etc/HISTORY. Then you can tag that commit as the - release. + Set the version number to that of the actual release (commit in + one, as described above). Pick a date about a week from now when + you intend to make the release. Use M-x add-release-logs to add + entries to etc/HISTORY and the ChangeLog file. It's best not to + commit these files until the release is actually made. Merge the + entries from (unversioned) ChangeLog into the top of the current + versioned ChangeLog.N and commit that along with etc/HISTORY. + Then you can tag that commit as the release. + Alternatively, you can commit and tag with the RC tag right away, + and delay the final tagging until you actually decide to make a + release and announce it. The "git tag" command can tag a specific + commit if you give it the SHA1 of that commit, even if additional + commits have been pushed in the meantime. + Name the tar file as emacs-XX.Y-rc1.tar. If all goes well in the following week, you can simply rename the file and use it for the actual release. If you need another release candidate, remember