[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Don't merge!!!! But it did. :-(

From: Alan Mackenzie
Subject: Don't merge!!!! But it did. :-(
Date: Tue, 28 Mar 2017 20:14:26 +0000
User-agent: Mutt/1.7.2 (2016-11-26)

Hello, Emacs.

Back in December, I changed the CC Mode version number in Emacs-25,
labelling the commit message with "Don't merge to trunk."  However, that
change _was_ merged to trunk.

Looking at .../admin/gitmerge.el, it is apparent that the injunction not
to merge to trunk is recognised by a script, not a human, and the script
doesn't recognise "don't", only "do not" written in full.

To prevent this happening to anybody else, or to me again, I propose to
enhance the pertinent regexp also to recognise "don't".  Any objections?

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index c3981dd..6e71ee5 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -50,7 +50,7 @@
 (defvar gitmerge-skip-regexp
   ;; We used to include "sync" in there, but in my experience it only
   ;; caused false positives.  --Stef
-  "back[- ]?port\\|cherry picked from commit\\|\\(do not\\|no need to\\) 
+  "back[- ]?port\\|cherry picked from commit\\|\\(do\\( no\\|n'\\)t\\|no need 
to\\) merge\\|\
 re-?generate\\|bump version\\|from trunk\\|Auto-commit"
   "Regexp matching logs of revisions that might be skipped.
 `gitmerge-missing' will ask you if it should skip any matches.")

Alan Mackenzie (Nuremberg, Germany).

reply via email to

[Prev in Thread] Current Thread [Next in Thread]