From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Freeze is almost here Date: Sat, 14 Nov 2015 15:37:51 +0100 Message-ID: <876114lk8w.fsf@isaac.fritz.box> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447554332 19204 80.91.229.3 (15 Nov 2015 02:25:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 15 Nov 2015 02:25:32 +0000 (UTC) Cc: jwiegley@gmail.com, schwab@linux-m68k.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 15 03:25:22 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 1Zxn0L-00078H-6X for ged-emacs-devel@m.gmane.org; Sun, 15 Nov 2015 03:25:21 +0100 Original-Received: from localhost ([::1]:39093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zxn0K-0006xc-7K for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 21:25:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zxbxo-0001sa-67 for emacs-devel@gnu.org; Sat, 14 Nov 2015 09:38:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zxbxj-0001Sw-1B for emacs-devel@gnu.org; Sat, 14 Nov 2015 09:38:00 -0500 Original-Received: from randomsample.de ([5.45.97.173]:47733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zxbxi-0001Sn-Or; Sat, 14 Nov 2015 09:37:54 -0500 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=gD4Lx2s4J9fVntjA9/RwbmhtUZWjjkKonuab27Ez4go=; b=Es4s9lPn3ByhKhbiJQui9IaLeBhCUTZZA0nDZrNsQp9mu+alHG4MJW7PpNCUl3f3UdnE2rxeFUefFwgjuwtzCu15BoYS2WDShkDTJL5GH4HseysZbcF4M6OSPGxCXpnS; Original-Received: from ip4d1645ea.dynamic.kabel-deutschland.de ([77.22.69.234] helo=isaac.fritz.box) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Zxbxg-0006QO-EQ; Sat, 14 Nov 2015 15:37:52 +0100 In-Reply-To: <8337w8em8a.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 14 Nov 2015 15:36:53 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.5 (gnu/linux) 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.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:194469 Archived-At: Eli Zaretskii writes: >> 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"? Yes. Cherry-picks are detected through the "patch-id", which is not affected by the commit message but only by the diff (see 'git help patch-id'). This is why it's fine to change the commit message, but when you resolve a conflict, the patch-id will usually change. 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. > 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. -David