From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Procedure for reverting commits on release branch Date: Mon, 04 Jan 2021 12:06:18 -0500 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11768"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Jan 04 18:08:41 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 1kwTLV-0002zE-2P for ged-emacs-devel@m.gmane-mx.org; Mon, 04 Jan 2021 18:08:41 +0100 Original-Received: from localhost ([::1]:53094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwTLU-0006KV-46 for ged-emacs-devel@m.gmane-mx.org; Mon, 04 Jan 2021 12:08:40 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwTJo-0004nY-0b for emacs-devel@gnu.org; Mon, 04 Jan 2021 12:06:56 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:38654) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwTJn-00018Q-Oy for emacs-devel@gnu.org; Mon, 04 Jan 2021 12:06:55 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1kwTJF-0003CY-Vw; Mon, 04 Jan 2021 12:06:27 -0500 In-Reply-To: (Glenn Morris's message of "Sun, 03 May 2020 13:20:09 -0400") 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:262444 Archived-At: A reminder about this issue, which happened again with recent AIX changes: https://lists.gnu.org/r/emacs-devel/2020-05/msg00433.html If a commit is made on the release branch, and then one wants to instead have it only on master, then given the following commit sequence: 1) emacs-27: do something 2) emacs-27: revert something 3) master: do something If gitmerge.el is now used to merge emacs-27 to master: commit 1) is skipped, because it is already on master commit 2) is merged Net result: 3) is reverted on master and has to be applied again by hand. A more efficient way to do this would be: 1) emacs-27: do something 2) emacs-27: revert something, and mark "do not merge to master" Then no special handling is needed.