From: Alan Mackenzie <acm@muc.de>
To: emacs-devel@gnu.org
Subject: Don't merge!!!! But it did. :-(
Date: Tue, 28 Mar 2017 20:14:26 +0000 [thread overview]
Message-ID: <20170328201426.GA22884@acm> (raw)
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\\) merge\\|\
+ "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).
next reply other threads:[~2017-03-28 20:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-28 20:14 Alan Mackenzie [this message]
2017-03-28 20:57 ` Don't merge!!!! But it did. :-( Paul Eggert
2017-03-28 21:08 ` Alan Mackenzie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170328201426.GA22884@acm \
--to=acm@muc.de \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.