From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Don't merge!!!! But it did. :-( Date: Tue, 28 Mar 2017 20:14:26 +0000 Message-ID: <20170328201426.GA22884@acm> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1490732126 14270 195.159.176.226 (28 Mar 2017 20:15:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 28 Mar 2017 20:15:26 +0000 (UTC) User-Agent: Mutt/1.7.2 (2016-11-26) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 28 22:15:21 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csxWH-0002Ms-RB for ged-emacs-devel@m.gmane.org; Tue, 28 Mar 2017 22:15:09 +0200 Original-Received: from localhost ([::1]:55123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csxWN-000534-Lz for ged-emacs-devel@m.gmane.org; Tue, 28 Mar 2017 16:15:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csxWI-000523-CM for emacs-devel@gnu.org; Tue, 28 Mar 2017 16:15:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csxWE-0006Fy-BE for emacs-devel@gnu.org; Tue, 28 Mar 2017 16:15:10 -0400 Original-Received: from ocolin.muc.de ([193.149.48.4]:60154 helo=mail.muc.de) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1csxWE-0006Ec-0v for emacs-devel@gnu.org; Tue, 28 Mar 2017 16:15:06 -0400 Original-Received: (qmail 61594 invoked by uid 3782); 28 Mar 2017 20:15:04 -0000 Original-Received: from acm.muc.de (p548C6D2E.dip0.t-ipconnect.de [84.140.109.46]) by colin.muc.de (tmda-ofmipd) with ESMTP; Tue, 28 Mar 2017 22:15:03 +0200 Original-Received: (qmail 22977 invoked by uid 1000); 28 Mar 2017 20:14:26 -0000 Content-Disposition: inline X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 193.149.48.4 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:213460 Archived-At: 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).