From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Freeze is almost here Date: Sat, 14 Nov 2015 17:02:52 +0200 Message-ID: <83wptkd3oj.fsf@gnu.org> References: <8737wgw7kf.fsf@lifelogs.com> <87io5bv1it.fsf@lifelogs.com> <87egfzuwca.fsf@lifelogs.com> <876118u6f2.fsf@lifelogs.com> <87io56qgid.fsf@lifelogs.com> <838u61g0sr.fsf@gnu.org> <837fllg06m.fsf@gnu.org> <87d1vdfurp.fsf@igel.home> <83wptldn2x.fsf@gnu.org> <87io55km09.fsf@isaac.fritz.box> <83fv09djs1.fsf@gnu.org> <87egfslp1x.fsf@isaac.fritz.box> <87a8qglow1.fsf@isaac.fritz.box> <8337w8em8a.fsf@gnu.org> <876114lk8w.fsf@isaac.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447557495 30249 80.91.229.3 (15 Nov 2015 03:18:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 15 Nov 2015 03:18:15 +0000 (UTC) Cc: jwiegley@gmail.com, schwab@linux-m68k.org, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 15 04:18:07 2015 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 1ZxnpO-00039p-Gh for ged-emacs-devel@m.gmane.org; Sun, 15 Nov 2015 04:18:06 +0100 Original-Received: from localhost ([::1]:39401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxnpN-0004ln-Nr for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 22:18:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxcM6-00076w-Of for emacs-devel@gnu.org; Sat, 14 Nov 2015 10:03:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxcM2-0001Kx-Jk for emacs-devel@gnu.org; Sat, 14 Nov 2015 10:03:06 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:55122) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxcM2-0001Ks-C8 for emacs-devel@gnu.org; Sat, 14 Nov 2015 10:03:02 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NXT00F007XZII00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 14 Nov 2015 17:03:01 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NXT00FOU8H0GV40@a-mtaout22.012.net.il>; Sat, 14 Nov 2015 17:03:01 +0200 (IST) In-reply-to: <876114lk8w.fsf@isaac.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:194472 Archived-At: > From: David Engster > Cc: schwab@linux-m68k.org, jwiegley@gmail.com, emacs-devel@gnu.org > Date: Sat, 14 Nov 2015 15:37:51 +0100 > > But when you later *merge* the branch from which you cherry-picked (like > we did with 'master'), git of course sees the cherry-picked commits as > merged, and hence does not check the patch-id later as well (most likely > because that would be slow). At least that's how I understand it. I hope we won't merge from master to emacs-25. > > Also, what about the effect of the "cherry-pick -x" switch, does > > affect gitmerge in any way? > > We could of course add "cherry picked" to the gitmerge-skip-regexp, but > otherwise, the '-x' has no affect on how git itself detects > cherry-picks. If detection of cherry-picks is reliable, I see no need to add that to gitmerge-skip-regexp. Thanks.