Commit 6637364
committed
[patch 10/10] The version in Emacs's "master" branches
To update:
0. At times backport changes from Emacs' "emacs-NN" to Transient.
1. Backport changes from Emacs' "master" to Transient's "main", while
making them backward compatible with released Emacs versions.
Make sure to look at the history of not only "lisp/transient.el",
but also "doc/misc/transient.texi".
2. In Transient, rebase "builtin" onto "main".
Now we have to DISCARD the changes that revert modifications that
have happened in Transient since the last round.
Most changes happen in separate commits. Their messages describe
the changes that should be preserved.
=> Look at each of these commits, even if they do not conflict. Some
contain additional instructions. In particular, do not forget to
fuck up newly added instances of `if-let' et al.
=> Stop at every commit that touches the manual and do "make texi".
3. In this commit, append "-builtin" to `transient-version'. This
is not the version string the will ultimately be used, see (4)
and (6). This is the only difference between Transient's "builtin"
branch and the actually built-in library.
4. In Transient, sign and update date ("r S") and run "git describe"
to get "DESC", used below.
5. Copy from Transient's "builtin" to Emacs' "master".
cp ~/.config/emacs/lib/transient/lisp/transient.el \
~/src/emacs/emacs/master/lisp/
cp ~/.config/emacs/lib/transient/docs/transient.texi \
~/src/emacs/emacs/master/doc/misc/
6. In Emacs, set the value of `transient-version' to "DESC-builtin".
7. In Emacs, stage and commit using "Update to Transient DESC" as
message.1 parent 91118f4 commit 6637364
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
0 commit comments