diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-03-18 09:02:30 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-03-18 09:03:03 -0700 |
| commit | c0be4754d73c5acad6e0e51aadc4eac51557cb6b (patch) | |
| tree | 2e77f5c8b95f432fb844d65f1dfb4d501f859496 | |
| parent | b72ddbdfffe87f23461d2ff97b8e6c7984591e92 (diff) | |
| download | emacs-c0be4754d73c5acad6e0e51aadc4eac51557cb6b.tar.gz | |
* admin/make-tarball.txt: Be kind to people merging branches.
| -rw-r--r-- | admin/make-tarball.txt | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index e644f96202e..9caf22d7188 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 |