diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-12-25 21:13:45 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-12-25 22:31:41 -0700 |
| commit | cf40c6ea3f5f9424a8d6f8ab9e4b0b58eb7c860c (patch) | |
| tree | d9e0691f365f15e534b940014dd43617c815c4db /.mrconfig.in | |
| parent | 561a8baef7acd5e3058133559be635ffeb164327 (diff) | |
| download | dotfiles-cf40c6ea3f5f9424a8d6f8ab9e4b0b58eb7c860c.tar.gz | |
integrate new Emacs workstation devel builds
Diffstat (limited to '.mrconfig.in')
| -rw-r--r-- | .mrconfig.in | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index 94853f01..2ef3d1f6 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -420,6 +420,30 @@ post_checkout = install-git-hooks pandoc-citeproc-preamble skip = lazy +[src/emacs] +checkout = git clone --no-checkout https://git.savannah.gnu.org/git/emacs.git emacs +post_checkout = + cd emacs + git remote add -f demeter demeter:emacs + git checkout -b melete demeter/melete + # These configure flags are for my workstation development builds. + ./autogen.sh + ./configure -C --with-native-compilation --with-pgtk +fixups = + git branch --unset-upstream melete + git config branch.melete.rebase true + git config branch.melete.pushRemote demeter + git config --replace-all remote.demeter.push ":" "^:$" + git config --replace-all remote.demeter.push "+melete:melete" "^\+melete:melete$" +# We don't have the melete branch's upstream set to origin/master to avoid +# accidental attempts to push to upstream master by typing "P u" in magit +# (push.default cannot help here). So to update melete from its upstream, we +# use either "F|r e origin/master RET" or this definition. "pull" not +# "update" because we want to update from upstream master deliberately, not as +# part of automated updates. +pull = git checkout melete && git pull --rebase origin master +skip = ! workstation + [src/cl/consfigurator] checkout = git clone 'demeter:consfigurator' 'consfigurator' post_checkout = |