diff options
| -rw-r--r-- | .mrconfig.in | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index c1854fd6..7fb5a9fa 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -528,10 +528,17 @@ post_clean = ./autogen.sh autoconf post_checkout = cd emacs git remote add -f demeter demeter:emacs + git remote add -f debian https://salsa.debian.org/rlb/deb-emacs.git/ on spwhitton@melete && git checkout -b melete demeter/melete ./autogen.sh all - workstation && git worktree add -b athena/unstable \ - "$HOME/src/emacs-snapshot" demeter/athena/unstable + if workstation; then + git worktree add -b athena/unstable \ + "$HOME/src/emacs-snapshot" demeter/athena/unstable + git worktree add -b deb/emacs/d/sid/master \ + "$HOME/src/emacs-dfsg" debian/deb/emacs/d/sid/master + git worktree add -b deb/emacs-non-dfsg/d/sid/master \ + "$HOME/src/emacs-non-dfsg" debian/deb/emacs-non-dfsg/d/sid/master + fi fixups = git rev-parse melete@{upstream} >/dev/null 2>&1 \ && git branch --unset-upstream melete @@ -540,6 +547,12 @@ fixups = git config branch.melete.pushRemote demeter git config --replace-all remote.demeter.push ":" "^:$" git config --replace-all remote.demeter.push "+melete:melete" "^\+melete:melete$" + git config branch.deb/emacs/d/sid/master.dpmUpstreamBranch deb/emacs/d/sid/upstream + git config branch.deb/emacs/d/sid/master.dpmPatchedBranch deb/emacs/d/sid/patched + git config branch.deb/emacs-non-dfsg/d/sid/master.dpmUpstreamBranch \ + deb/emacs-non-dfsg/d/sid/upstream + git config branch.deb/emacs-non-dfsg/d/sid/master.dpmPatchedBranch \ + deb/emacs-non-dfsg/d/sid/patched # 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 for convenient updates of melete to its |