From: Glenn Morris Date: Wed, 24 Jan 2018 19:44:39 +0000 (-0500) Subject: * admin/automerge: Disable rebasing. X-Git-Tag: emacs-27.0.90~5814 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=686c83a473e4b235caac018aa0b61a5aad7c6a5b;p=emacs.git * admin/automerge: Disable rebasing. --- diff --git a/admin/automerge b/admin/automerge index d96974ca562..54ac88db4ff 100755 --- a/admin/automerge +++ b/admin/automerge @@ -181,10 +181,13 @@ echo "Tests finished ok" ## In case someone else pushed while we were working. -echo "Checking for remote changes..." -git fetch || die "fetch error" +#echo "Checking for remote changes..." +#git fetch || die "fetch error" +## NB If there were remote changes, this would rewrite the release +## branch commits, which is not what we want. +## Ref eg http://lists.gnu.org/r/emacs-devel/2014-12/msg01435.html ## git >= 1.8.5 has "pull --rebase=preserve" -git rebase --preserve-merges || die "rebase error" +#git rebase --preserve-merges || die "rebase error" echo "Pushing..."