From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25 Date: Tue, 12 Jan 2016 09:12:18 -0800 Message-ID: References: <20160112070839.6841.77764@vcs.savannah.gnu.org> <0mlh7u7nds.fsf@fencepost.gnu.org> Reply-To: John Wiegley NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1452618801 31857 80.91.229.3 (12 Jan 2016 17:13:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Jan 2016 17:13:21 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 12 18:13:14 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aJ2VM-0007O4-VQ for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 18:13:13 +0100 Original-Received: from localhost ([::1]:33298 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2VM-0004mF-AO for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 12:13:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2Ud-00045h-0w for emacs-devel@gnu.org; Tue, 12 Jan 2016 12:12:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJ2UY-0001Xd-Up for emacs-devel@gnu.org; Tue, 12 Jan 2016 12:12:26 -0500 Original-Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]:33216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2UY-0001XI-Py; Tue, 12 Jan 2016 12:12:22 -0500 Original-Received: by mail-pa0-x232.google.com with SMTP id cy9so342781454pac.0; Tue, 12 Jan 2016 09:12:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:reply-to:mail-followup-to:mime-version:content-type; bh=jcv/kds70h5Ty7pt9JlDvz3g4KRanmFribHLLmfKxbI=; b=muzA9DD02hXvovmPyCUV9G5LGWUgNPcM5obGpiCiPUGa7VDP3XHInFKiaKnOLaNmuf Hw+HHP9vFYknIOwLMtkzrCYJmlsdTnhVejyFqu/4Av0bTGFaoLCPN0sIGiEMERI2VV/O 045sJ1Av6ubO6kL4fkQ1Cq11+z0qIPO13XRc+YpmKKRXWVswgMMFx0dth7Xo48MCzqbT PiO4Tcc6kgGKbwfWAhpeqO9pRPzmKbOH4QK6Y5Zny/hHhc81MHcO95D0MMVyatabJxAB /USSHqdnb1LnjPZFvY7w7Mdl6sTjHDCQypQDG3kDxJxVVBAWdLK6rxOBoJTTy2XSEowx w2Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:in-reply-to:date:message-id :references:user-agent:reply-to:mail-followup-to:mime-version :content-type; bh=jcv/kds70h5Ty7pt9JlDvz3g4KRanmFribHLLmfKxbI=; b=OMMbdaIKQyU5+PJub7Irb8t30EuXaTxbxldav5WtIDMLqSSzxZVSa6Hppmc78mqwHp +Rv2l8xyEKPgrKiRTMny5NFjAllWKA2drN1YZppx2YDJ7XYEFYpkN3n93CGEJHj28IXo 9OUdDJEoZcZwCDwD18X955Y+zh3IlgLmmix39ZBOeLvr9Q9bhh59I2O16cvl1cud86kb Sp2nF6inL/aI2P++phSRbRuX4MZZomnMD/SIQ3hy9rUd/x47RvzfALauxhA1m7/l6WBQ lz96OPtnNAnBZnIxsmyXH9fe/OQjEGOs+lvvl8LoDSenJxx77QgaaS+z6+Ow6Th6Kb4Q CPaw== X-Gm-Message-State: ALoCoQl4yeD1XIeEGGAc94BqEZNpzRwYHk+g7K/5Xj8vU6B230mnyM1WY6DqB9Qywe6Fe4yurRRhad6enCCMygcU/JJcJp1oLw== X-Received: by 10.66.161.227 with SMTP id xv3mr17707325pab.117.1452618742237; Tue, 12 Jan 2016 09:12:22 -0800 (PST) Original-Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id h66sm31694562pfj.52.2016.01.12.09.12.21 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Jan 2016 09:12:21 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id F1B2A123BE334; Tue, 12 Jan 2016 09:12:20 -0800 (PST) In-Reply-To: (Glenn Morris's message of "Tue, 12 Jan 2016 12:09:34 -0500") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) Mail-Followup-To: Glenn Morris , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::232 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:198091 Archived-At: >>>>> Glenn Morris writes: > Oh, I guess it is because the original commit message happened to contain > the word "merge", and thus match gitmerge-skip-regexp. IIRC, gitmerge should > ask you whether to skip a given commit, not just unconditionally skip it. > Some judgement is required when deciding to answer yes or no to that prompt. > The gitmerge regexp is biased to match more rather than less. This was my mistake, in thinking gitmerge was DTRT. I'll review each skip manually from now on. -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2