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

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

[Alan Mackenzie]

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).

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

[Paul Eggert]

On 03/28/2017 01:14 PM, Alan Mackenzie wrote:
> 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?

Sounds good to me.

You might want to replace "n'" with "n['’]" in the regexp. (Now it's 
time for me to duck and run. :-)

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

[Alan Mackenzie]

Hello, Paul.

On Tue, Mar 28, 2017 at 13:57:33 -0700, Paul Eggert wrote:
> On 03/28/2017 01:14 PM, Alan Mackenzie wrote:
> > 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?

> Sounds good to me.

> You might want to replace "n'" with "n['’]" in the regexp. (Now it's 
> time for me to duck and run. :-)

That occurred to me the moment I'd sent my opening post.  I _knew_ you'd
be getting back to me with it.  :-)

But yes, I'll put that curly quote into the regexp, too.

-- 
Alan Mackenzie (Nuremberg, Germany).