From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Some proposed backports from master to emacs-25 Date: Tue, 04 Oct 2016 08:51:51 +0200 Message-ID: <87h98s38u0.fsf@engster.org> References: <87shseyhfl.fsf@users.sourceforge.net> <83int8oc6b.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1475564837 26431 195.159.176.226 (4 Oct 2016 07:07:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 4 Oct 2016 07:07:17 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: emacs-devel@gnu.org, Noam Postavsky To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 04 09:07:13 2016 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 1brJob-00054T-7R for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 09:07:01 +0200 Original-Received: from localhost ([::1]:40551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brJoZ-0002iD-Qk for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 03:06:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brJa2-0007bJ-HX for emacs-devel@gnu.org; Tue, 04 Oct 2016 02:51:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brJZz-0003BI-Cz for emacs-devel@gnu.org; Tue, 04 Oct 2016 02:51:58 -0400 Original-Received: from randomsample.de ([5.45.97.173]:36975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brJZz-0003AF-2j; Tue, 04 Oct 2016 02:51:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=sFQvMRjjARsT7m1maX7TbMZdds0rWbLZTf6P0saYk1A=; b=IoSgPRFuVLIm07BM+kSdVYI2cQeweI4IdFJ8zeSY+Hrvz6wilCBrFuIttd5CBv6DI6a8C7NDa0oIvyJvpZvrSWIsUV4s8YbIaW68Esn1+cyJk7OhQzSnI6H96uBX9idg; Original-Received: from ip4d167ffb.dynamic.kabel-deutschland.de ([77.22.127.251] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1brJZx-0003UP-Jk; Tue, 04 Oct 2016 08:51:53 +0200 In-Reply-To: <83int8oc6b.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 04 Oct 2016 09:34:04 +0300") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:207972 Archived-At: Eli Zaretskii writes: >> From: Noam Postavsky >> Date: Mon, 3 Oct 2016 18:59:50 -0400 >> > >> On Sun, Oct 2, 2016 at 10:05 AM, wrote: >> > >> > Git added "cherry picked from commit" but it looks like >> > gitmerge-skip-regexp wouldn't match that, should I change it to match? >> > >> >> What about this question? > > Sorry, forgot to answer. I see no problems, as gitmerge-skip-regexp > already handles that: > > (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\\|\ > ^^^^^^^^^^^^^^^^^^^^^^^^^ > 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.") This is only on the master branch, though. I've no idea why I didn't commit this to emacs-25... -David