From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Merges from release branch Date: Sun, 29 Aug 2021 13:14:59 +0200 Message-ID: <87zgt0biz0.fsf@randomsample> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> <874kb8mv9q.fsf@gmail.com> <83tuj8ldgi.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37097"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: philipk@posteo.net, danflscr@gmail.com, theo@thornhill.no, emacs-devel@gnu.org, =?utf-8?B?Sm/Do28gVMOhdm9yYQ==?= , dgutov@yandex.ru, larsi@gnus.org, sir@cmpwn.com, monnier@iro.umontreal.ca To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 13:17:14 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKIoL-0009Pt-QF for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 13:17:14 +0200 Original-Received: from localhost ([::1]:32988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKIoK-0006t5-L6 for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 07:17:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKInj-0006Bk-3S for emacs-devel@gnu.org; Sun, 29 Aug 2021 07:16:35 -0400 Original-Received: from [2a03:4000:42:1a1:9400:eeff:feb4:c8a0] (port=37628 helo=zplane.randomsample.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKIng-0006Ii-ND; Sun, 29 Aug 2021 07:16:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Transfer-Encoding:Content-Type:MIME-Version :Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=W7aSIRzJRXtiu4Vpt/xWiMsOUkY79KGqs9rEmW0ffLw=; b=lEe/qH9f8+Tn/tMharyWGrJOf0 DBAAJRx4HuUmFNiVZ9n+WvExZkY/1G5ij0unuqfeVS0c99DTsjFUkcbQsrSlaF4WA43/I1qvqC/EO XNqxghlHerL98K3GpbNle7iku5HTCPA+t95WIU+7jlorG+UceqCyHOMBFdCJz9zdcCV9zRvO/YNkw 48+2EOC6hrUwoW8MIYo4ts9mbMiqG+wpTT39KqgNTS4mvNBezUEatTlsP0Qwyt00ZX0sRgbfKjEvr rBDpZccXxmXyrcHvn4UFLlEpESw/RhGNCdhYLfTCgceKFgkbs1mePtmc7FV9RMTWIsJgDBcIwO3aX 090SRrZQ==; Original-Received: from ip5f5abab6.dynamic.kabel-deutschland.de ([95.90.186.182] helo=void) by zplane.randomsample.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKImH-0002QL-Aq; Sun, 29 Aug 2021 13:15:18 +0200 In-Reply-To: <83tuj8ldgi.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 29 Aug 2021 14:03:57 +0300") X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a03:4000:42:1a1:9400:eeff:feb4:c8a0 (failed) Received-SPF: pass client-ip=2a03:4000:42:1a1:9400:eeff:feb4:c8a0; envelope-from=deng@randomsample.de; helo=zplane.randomsample.de X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:273399 Archived-At: >> This is a tangent, but we also have some practice here in Emacs which I >> don't fully understand, which is to "merge back from release branches" >> to integrate fixes from those branches into 'main'. That in itself >> already opens the doors to "duplicated commits" if special care isn't >> taken. That's because these merges are special: they somehow don't >> contain all of the stuff that was present in the release branches. See, >> for example, this commit: >>=20 >> commit 8ba6a38b3bccab6eda8e1962e4c8618704b9f83e >> Merge: 979f14e641 5b03849102 >> Author: Glenn Morris >> Date: Wed Aug 25 07:51:41 2021 -0700 >>=20=20=20=20=20=20 >> ; Merge from origin/emacs-27 >>=20=20=20=20=20=20 >> The following commit was skipped: >>=20=20=20=20=20=20 >> 5b03849102 (origin/emacs-27) ; * test/lisp/files-tests.el: Add t= ests ... > > What problems do you see with these merges? I don't think I follow. > > The commits are skipped either because they are marked "not to merge" > (meaning they are inappropriate for master) or because master already > has the same or a different fix. I think Jo=C3=A3o is confused how you would "skip" a commit in a merge, because you actually can't. The more proper way would be to say "this commit was separately merged with the strategy 'ours'", but this is quite a mouthful. The merge stategy 'ours' simply means that the content of the merged commits is discarded, but it's a perfectly valid way to merge, so nothing "evil" about it. -David