From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Harald_J=C3=B6rg?= Newsgroups: gmane.emacs.devel Subject: Re: How to "backport" a patch from master to emacs-28? Date: Thu, 20 Oct 2022 19:41:33 +0000 Message-ID: <87tu3yp9jm.fsf@vdesktop> References: <87zgdqpei6.fsf@vdesktop> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8297"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Emacs Developer List To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Oct 20 21:45:30 2022 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 1olbTp-0001o8-Vu for ged-emacs-devel@m.gmane-mx.org; Thu, 20 Oct 2022 21:45:26 +0200 Original-Received: from localhost ([::1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olbTp-0005CQ-0p for ged-emacs-devel@m.gmane-mx.org; Thu, 20 Oct 2022 15:45:25 -0400 Original-Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olbQS-0002Ma-Gu for ged-emacs-devel@m.gmane-mx.org; Thu, 20 Oct 2022 15:41:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olbQP-0002Lf-5o for emacs-devel@gnu.org; Thu, 20 Oct 2022 15:41:53 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olbQ9-0008O2-Pq for emacs-devel@gnu.org; Thu, 20 Oct 2022 15:41:52 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 35E6024002A for ; Thu, 20 Oct 2022 21:41:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1666294895; bh=ey0nXHiHAgyPFMBust5MRzgcKPsUIFKKaPREFx9U3Jg=; h=From:To:Cc:Subject:Date:From; b=XtIp1ly9rmLeucpSTOEyC7g1J6k8D+jcBKODB/SfKVeO9cie0g9UfmxHfFNvcXiGH E6cUw2lvRnVgqH0cSK+O75uekPRzNQy8AGwFrcrCoHLbIRrMWRrD1Zw9fUixnZPv/m tqaYvZiJR28iErP8CucGLHUA9LXIFV+lkP7A1me+5r1rKV/LMEDSqb5t70bNQq5CZe 7yzSyzueJ4bNJCNcsVC5kLlBqXXO6QxGVk5zZD97oSe6kSLxAxHgHHwIoSpfL4hvZ+ yhjMHqOQibUu7ZePtyKO3+hEiOITu7eLaJ5+JIXubYM5BJvo20nVZYXWWPOc6gzWwW wsaHylCOMni6A== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MtdJW3Jt5z6tmS; Thu, 20 Oct 2022 21:41:31 +0200 (CEST) In-Reply-To: (Stefan Monnier's message of "Thu, 20 Oct 2022 14:14:00 -0400") Received-SPF: pass client-ip=185.67.36.65; envelope-from=haj@posteo.de; helo=mout01.posteo.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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.29 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:298172 Archived-At: Stefan Monnier writes: >> I understand that the usual procedure is to merge _from_ the release >> branches _to_ master, but that ship has sailed. Is it ok to cherry-pick >> the single commit and push it to emacs-28? It is a trivial patch, >> below is what "git show" has to say. > > Yes, that can be done, indeed. But please mark it as a "backport". > Or use `git cherry-pick` which should label it similarly. This should > make sure that the next time we merge from emacs-28 back to `master`, > `gitmerge.el` can automatically skip it to avoid spurious conflicts. Thanks for the recipe! I've done this now. -- Cheers, haj