From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuan Fu Newsgroups: gmane.emacs.devel Subject: Re: Moving etc/NEWS around causing release branch merge to fail again Date: Sun, 1 Jan 2023 15:23:26 -0800 Message-ID: References: <83mt7x22gs.fsf@gnu.org> <2955FDDC-828C-4EC7-A250-FB7E67850DA5@gmail.com> <83a6324vi2.fsf@gnu.org> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4143"; mail-complaints-to="usenet@ciao.gmane.io" Cc: stefankangas@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Jan 02 00:24:22 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 1pC7gk-0000vJ-52 for ged-emacs-devel@m.gmane-mx.org; Mon, 02 Jan 2023 00:24:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC7fx-0003Oa-Oy; Sun, 01 Jan 2023 18:23:33 -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 1pC7fw-0003OR-Mf for emacs-devel@gnu.org; Sun, 01 Jan 2023 18:23:32 -0500 Original-Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pC7fu-00031J-Sv; Sun, 01 Jan 2023 18:23:32 -0500 Original-Received: by mail-qt1-x833.google.com with SMTP id h21so21356000qta.12; Sun, 01 Jan 2023 15:23:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=w9w8azKU2T3rqSWhNokShvmH/H8ywetRc+ENC4Jx1RQ=; b=pV4WO5i6eYqwVPbjjGesul2rL8R9ISal0QXxJ8D4RhdI1W5SDdmoTxgEPFjrNkWPsH 70rAvp//m52DeQbQj8j5BHjHhQ5E4fE6v8d1Y1N2cqbjGhAFeJNQXIKdW06w158pWZQp o9IoUjgjPqjT4ARjoxvxofJnIs4fzqKdVYfnyLKNKeZwvfoT0y7tTA8JF3E7AJPugZqa R5stvLidiCQrlwYK1aR1RKWSkl5QYQ3iybc+0HxfyaSuMuiAMqaPz0iuEJyn5R8ZiQLw sJqHMsAYVv4WhiDU0zdqJNYYZ6heQWlwhC+vAr9of9BwkpXC4qeV+N924Cbn5OR0p3Az Kf6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w9w8azKU2T3rqSWhNokShvmH/H8ywetRc+ENC4Jx1RQ=; b=Bo1YKn0Doc1s9+G168Qm3v8/PKLSWUTdiUWJZVGc8kCFyrpv8LwVZpOeeXGuD7e6uW Xv5sZt++rSPWJz05uQacxvaXv9Lba8nnxgdAe/WWbeEsBZIVLN5kspkn3XU1SgkNNM3S T8ZoALisc9/f8DW5YkXrdcV7CP3WJKxqPQFImbwFSQDn8sq95JTaGbrYn6TdhlPJ28ZE QO1g0zxeN7sYvIXCvzkUpkplhmEJse50g2ojeTvyshrYHLA1FbCrlnRbrgqq52uu/Nbc 9aGzm2QBZwY0O64UUzuw2mqphQ1TXa3S9usiqrv9EtZ39f5KDRzCAzcbprdQHI1spkQI gfVw== X-Gm-Message-State: AFqh2kr7QewFSdV3j/y9BLihQUjh/5e6X68FeRqpSFyEfqsZB1I5YgM9 gpEL5eQeWat5aLU8eeXnZr8JM1Re1HZ+eA== X-Google-Smtp-Source: AMrXdXvP4wwZC5zHy09p2/pHfBtSpSSudZ0QA5UdHBXqmxdg/tI8Jtfj+QjkdAfIEtLGRWuHH7jugw== X-Received: by 2002:ac8:678b:0:b0:3a9:902d:414e with SMTP id b11-20020ac8678b000000b003a9902d414emr52739733qtp.15.1672615408680; Sun, 01 Jan 2023 15:23:28 -0800 (PST) Original-Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id cg4-20020a05622a408400b003aba8e9efdasm4307927qtb.4.2023.01.01.15.23.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Jan 2023 15:23:28 -0800 (PST) In-Reply-To: <83a6324vi2.fsf@gnu.org> X-Mailer: Apple Mail (2.3696.120.41.1.1) Received-SPF: pass client-ip=2607:f8b0:4864:20::833; envelope-from=casouri@gmail.com; helo=mail-qt1-x833.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:302184 Archived-At: > On Dec 31, 2022, at 10:30 PM, Eli Zaretskii wrote: >=20 >> From: Yuan Fu >> Date: Sat, 31 Dec 2022 14:42:35 -0800 >> Cc: Eli Zaretskii , >> emacs-devel@gnu.org >>=20 >> Do I need to do anything special when editing the NEWS file on = emacs-29? Doesn=E2=80=99t seem like it but just want make sure. >=20 > 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. Cool, thanks. Yuan=