From: Glenn Morris <rgm@gnu.org>
Date: Fri, 26 Oct 2018 04:57:53 +0000 (-0700)
Subject: * admin/automerge: Abort if NEWS gets modified.
X-Git-Tag: emacs-27.0.90~4254
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3575dd8e8c7edaa904220e5f59240b91814b5564;p=emacs.git

* admin/automerge: Abort if NEWS gets modified.
---

diff --git a/admin/automerge b/admin/automerge
index e88711f8d6d..b320369d174 100755
--- a/admin/automerge
+++ b/admin/automerge
@@ -174,6 +174,12 @@ merge ()
 merge
 
 
+## FIXME it would be better to trap this in gitmerge.
+## NEWS should never be modified, only eg NEWS.26.
+git diff --stat --cached origin/master | grep -q "NEWS " && \
+    die "NEWS has been modified"
+
+
 [ "$build" ] || exit 0