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: Moving etc/NEWS around causing release branch merge to fail again Date: Sun, 01 Jan 2023 08:30:29 +0200 Message-ID: <83a6324vi2.fsf@gnu.org> References: <83mt7x22gs.fsf@gnu.org> <2955FDDC-828C-4EC7-A250-FB7E67850DA5@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="35740"; mail-complaints-to="usenet@ciao.gmane.io" Cc: stefankangas@gmail.com, emacs-devel@gnu.org To: Yuan Fu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Jan 01 07:31:21 2023 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 1pBrsP-0009AG-6n for ged-emacs-devel@m.gmane-mx.org; Sun, 01 Jan 2023 07:31:21 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBrrZ-0008VK-CJ; Sun, 01 Jan 2023 01:30:29 -0500 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 1pBrrX-0008V4-8v for emacs-devel@gnu.org; Sun, 01 Jan 2023 01:30:27 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pBrrW-0005Mo-Oi; Sun, 01 Jan 2023 01:30:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=N/kr7Rhax1xTA9hreASMQ3g+kAi3pE13wJA/BEJ8xxY=; b=XIIskrPoJaJWpJ/NQrhJ UdlWho5BX5vMyqi3tFJz+KD6zVUuusdhe62MGiklw8BzwKyfkuTKDErvwfBzXGQJ4HNdqf5JNeoZE 4kdBOf1f1wRbJrg1vQ/uAelnMsOQoIAVnaru0FYSTe4fmVEyl/76dh7Ck/4NnB8qgq7QRDG0O38x5 /LJhI7KLIlay61DQk75IglwOCJP81Dzs74RzUr+ejSfLe2sezE1nb17s5nzbGXiJTRW3H2vyjasBJ xQ5D/kMoe/bBKGaCSUHzyhmduDRQHHiSErpheOvsMreFTZdtOw4CkpXEjiMe3oIuPtJKsDAPVt5A0 txJywN+gjMcMzQ==; Original-Received: from [87.69.77.57] (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 1pBrrU-0003IH-UU; Sun, 01 Jan 2023 01:30:26 -0500 In-Reply-To: <2955FDDC-828C-4EC7-A250-FB7E67850DA5@gmail.com> (message from Yuan Fu on Sat, 31 Dec 2022 14:42:35 -0800) 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:302175 Archived-At: > From: Yuan Fu > Date: Sat, 31 Dec 2022 14:42:35 -0800 > Cc: Eli Zaretskii , > emacs-devel@gnu.org > > Do I need to do anything special when editing the NEWS file on emacs-29? Doesn’t seem like it but just want make sure. No, editing NEWS on the emacs-29 branch doesn't need anything special. The problems happen on master, not on the branch. On master, we should never edit the NEWS.NN files from past versions, and especially not the one from the current release branch, on which we routinely make changes to the corresponding NEWS.