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 15:36:53 +0200 Message-ID: <8337w8em8a.fsf@gnu.org> References: <877flswse5.fsf@lifelogs.com> <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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447546284 9560 80.91.229.3 (15 Nov 2015 00:11:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 15 Nov 2015 00:11:24 +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 01:11:15 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 1ZxkuX-0002S5-B1 for ged-emacs-devel@m.gmane.org; Sun, 15 Nov 2015 01:11:13 +0100 Original-Received: from localhost ([::1]:38342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxkuW-0000MI-JK for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 19:11:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zxb0t-0001mu-De for emacs-devel@gnu.org; Sat, 14 Nov 2015 08:37:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zxb0q-0008MK-6B for emacs-devel@gnu.org; Sat, 14 Nov 2015 08:37:07 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:42658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zxb0p-0008LY-UJ for emacs-devel@gnu.org; Sat, 14 Nov 2015 08:37:04 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NXT00L004D9ES00@mtaout25.012.net.il> for emacs-devel@gnu.org; Sat, 14 Nov 2015 15:34:34 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NXT00JF24DMUK10@mtaout25.012.net.il>; Sat, 14 Nov 2015 15:34:34 +0200 (IST) In-reply-to: <87a8qglow1.fsf@isaac.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 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:194468 Archived-At: > From: David Engster > Cc: schwab@linux-m68k.org, jwiegley@gmail.com, emacs-devel@gnu.org > Date: Sat, 14 Nov 2015 13:57:34 +0100 > > David Engster writes: > > I see now that master was merged into emacs-25. Is this now the new > > workflow? If so, there's not much point in keeping gitmerge.el anyway. > > Sorry, forget what I said. I forgot the we don't freeze master anymore, > so I guess this was a one-time merge just to forward emacs-25. I was > just confused because git couldn't detect the cherry-picks, but this is > because of this merge from master. Could you describe the conditions necessary for gitmerge to detect cherry-picks? I see that it uses --cherry-mark, but would that mark cherry-picks whose commit message was edited by "cherry-pick -e"? (That editing is necessary to add "Backported", at least.) Also, what about the effect of the "cherry-pick -x" switch, does affect gitmerge in any way?