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: Merging release branch Date: Fri, 29 Oct 2021 22:29:01 +0200 Message-ID: <87bl37efsi.fsf@randomsample> References: <87bl37vg9l.fsf@gnus.org> <87pmrntzx8.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35765"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Glenn Morris , Stefan Kangas , Stefan Monnier , emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Oct 29 23:15:07 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 1mgZDO-00093m-Un for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 23:15:06 +0200 Original-Received: from localhost ([::1]:41390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgZDN-0000iv-Qf for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 17:15:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgYV0-00006T-6r for emacs-devel@gnu.org; Fri, 29 Oct 2021 16:29:14 -0400 Original-Received: from zplane.randomsample.de ([192.145.45.252]:55544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgYUw-0003m2-N9; Fri, 29 Oct 2021 16:29:13 -0400 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:Sender:Reply-To: Content-Transfer-Encoding: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=gUMvWASfO/oF/Az7KfId2l6W5SPs6/NkXfe4Aean8Ws=; b=kkyELntb4oWjDlfLtDzg+AIDv 7DnVQzf1lMVM3/2Y+U4zzZ29yNDCXWAmx2fyHaCPTiHCautdY1j4UKNFzM/f+5aOzQOxG3QPdKIrS lkVaBRY8COJBD42x6m5mKA5HBf7qJ/gc1HlkWz4503ShgVCrCeNfzK90ggFKEMHmmVA4E6hVEhXhR l0MmKwKzGl30co0fcn9Hl1WmkppBnKOqgFvjuEJU6q5MbbsQbVUSIEkVcLb4RTa1+WKIMpE1fligP aGq7IknU1VxT6x4KG+U8O4y+5zPCcvAV1S0XrvpQ2HyGlNYSXthNIIWGr41KCLemLWmchkr+24B2r NGv9Obvxg==; 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 1mgYUn-0003ES-IN; Fri, 29 Oct 2021 22:29:01 +0200 In-Reply-To: <87pmrntzx8.fsf@gnus.org> (Lars Ingebrigtsen's message of "Fri, 29 Oct 2021 21:05:07 +0200") Received-SPF: pass client-ip=192.145.45.252; envelope-from=deng@randomsample.de; helo=zplane.randomsample.de X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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:278244 Archived-At: > Stefan Monnier writes: > >> That's what `git merge -s ours emacs-28` does (it marks the commit as >> merged but without bringing any of the corresponding code changes). > > Oh, I see. But what if there was some other commit in emacs-28 that > that committer had forgotten to merge? Then it would also be kept out > of master? Yup. In that case, you need to do two merges with different merge strategies. That's what admin/gitmerge.el is for, and I think it's pretty easy to use (but I'm biased). > Your assumption here was that emacs-28 had already been merged, but I > think people would be likely to forget. For sure. I agree that doing cherry-picks from 'master' to 'emacs-28' would be easier for people, simply because they are familiar with it, but keeping track of what has been cherry-picked and what not can be pretty tedious, and git cannot help you much with that. -David