[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c0be475: * admin/make-tarball.txt: Be kind to people merging bran
From: |
Glenn Morris |
Subject: |
master c0be475: * admin/make-tarball.txt: Be kind to people merging branches. |
Date: |
Thu, 18 Mar 2021 12:03:14 -0400 (EDT) |
branch: master
commit c0be4754d73c5acad6e0e51aadc4eac51557cb6b
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
* admin/make-tarball.txt: Be kind to people merging branches.
---
admin/make-tarball.txt | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index e644f96..9caf22d 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -73,20 +73,23 @@ General steps (for each step, check for possible errors):
3. Set the version number (M-x load-file RET admin/admin.el RET, then
M-x set-version RET). For a pretest, start at version .90. After
- .99, use .990 (so that it sorts).
+ .99, use .990 (so that it sorts). Commit the resulting changes
+ as one, with nothing else included, and using a log message
+ of the format "Bump Emacs version to ...", so that the commit can
+ be skipped when merging branches (see admin/gitmerge.el).
The final pretest should be a release candidate.
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.
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master c0be475: * admin/make-tarball.txt: Be kind to people merging branches.,
Glenn Morris <=