diff options
| author | Stefan Kangas | 2022-06-29 15:34:21 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2022-06-29 15:34:21 +0200 |
| commit | 26e838e1df66a5b53ebc06ee4635bf59587375a6 (patch) | |
| tree | 78a95240668ce9971553ebfc3ac56af653e5d29d /admin | |
| parent | 6606c14d36bc5688a4dc5064ba327935657d657d (diff) | |
| parent | bf137fdbd2865773a34ec2c74d608cdd586d5a2c (diff) | |
| download | emacs-26e838e1df66a5b53ebc06ee4635bf59587375a6.tar.gz emacs-26e838e1df66a5b53ebc06ee4635bf59587375a6.zip | |
Merge from origin/emacs-28
bf137fdbd2 ; * admin/make-tarball.txt: Small clarification.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/make-tarball.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 02b4f318e26..98001e24e7d 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt | |||
| @@ -158,13 +158,15 @@ General steps (for each step, check for possible errors): | |||
| 158 | 158 | ||
| 159 | 5. Copy lisp/loaddefs.el to lisp/ldefs-boot.el. | 159 | 5. Copy lisp/loaddefs.el to lisp/ldefs-boot.el. |
| 160 | 160 | ||
| 161 | Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the | 161 | Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the files |
| 162 | files changed by M-x set-version. The easiest way of doing that | 162 | changed by M-x set-version. Note that the set-version changes |
| 163 | is "C-x v d ROOT-DIR RET", then go to the first modified file, | 163 | should be committed separately, as described in step 3 above. |
| 164 | press 'M' to mark all modified files, and finally 'v' to commit | 164 | |
| 165 | them. Make sure the commit log message mentions all the changes | 165 | The easiest way of doing that is "C-x v d ROOT-DIR RET", then go |
| 166 | in all modified files, as by default 'v' doesn't necessarily do | 166 | to the first modified file, press 'M' to mark all modified files, |
| 167 | so. | 167 | and finally 'v' to commit them. Make sure the commit log message |
| 168 | mentions all the changes in all modified files, as by default 'v' | ||
| 169 | doesn't necessarily do so. | ||
| 168 | 170 | ||
| 169 | If someone else made a commit between step 1 and now, | 171 | If someone else made a commit between step 1 and now, |
| 170 | you need to repeat from step 4 onwards. (You can commit the files | 172 | you need to repeat from step 4 onwards. (You can commit the files |