From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Merges from release branch (was: Gitlab Migration) Date: Sun, 29 Aug 2021 14:03:57 +0300 Message-ID: <83tuj8ldgi.fsf@gnu.org> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> <874kb8mv9q.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27927"; mail-complaints-to="usenet@ciao.gmane.io" Cc: philipk@posteo.net, danflscr@gmail.com, theo@thornhill.no, emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru, larsi@gnus.org, sir@cmpwn.com To: =?utf-8?B?Sm/Do28gVMOhdm9yYQ==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 13:06: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 1mKIdi-000744-9P for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 13:06:14 +0200 Original-Received: from localhost ([::1]:54958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKIdg-0001US-U7 for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 07:06:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKIbk-0000cj-NF for emacs-devel@gnu.org; Sun, 29 Aug 2021 07:04:12 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:34908) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKIbi-0007wu-1M; Sun, 29 Aug 2021 07:04:10 -0400 Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:3898 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKIbh-0005Ni-L3; Sun, 29 Aug 2021 07:04:09 -0400 In-Reply-To: <874kb8mv9q.fsf@gmail.com> (message from =?utf-8?B?Sm/Do28g?= =?utf-8?B?VMOhdm9yYQ==?= on Sun, 29 Aug 2021 10:53:53 +0100) 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:273398 Archived-At: > From: João Távora > Cc: Eli Zaretskii , "Philip K." , Daniel > Fleischer , Theodor Thornhill , > emacs-devel , Stefan Monnier > , Dmitry Gutov , Lars > Ingebrigtsen > Date: Sun, 29 Aug 2021 10:53:53 +0100 > > 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: > > commit 8ba6a38b3bccab6eda8e1962e4c8618704b9f83e > Merge: 979f14e641 5b03849102 > Author: Glenn Morris > Date: Wed Aug 25 07:51:41 2021 -0700 > > ; Merge from origin/emacs-27 > > The following commit was skipped: > > 5b03849102 (origin/emacs-27) ; * test/lisp/files-tests.el: Add tests ... 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.