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.bugs Subject: bug#52420: admin/release-branch.txt: move NEWS in single commit Date: Sat, 11 Dec 2021 10:16:38 +0200 Message-ID: <83r1ajr1y1.fsf@gnu.org> References: Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7247"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 52420@debbugs.gnu.org To: Stefan Kangas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 11 09:17:18 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1mvxZF-0001ef-VK for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 11 Dec 2021 09:17:18 +0100 Original-Received: from localhost ([::1]:42874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvxZD-0001xZ-Tp for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 11 Dec 2021 03:17:15 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:36406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvxZ0-0001xL-46 for bug-gnu-emacs@gnu.org; Sat, 11 Dec 2021 03:17:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvxYz-0000xC-SB for bug-gnu-emacs@gnu.org; Sat, 11 Dec 2021 03:17:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvxYz-0003h1-Jx for bug-gnu-emacs@gnu.org; Sat, 11 Dec 2021 03:17:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 11 Dec 2021 08:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52420 X-GNU-PR-Package: emacs Original-Received: via spool by 52420-submit@debbugs.gnu.org id=B52420.163921062014183 (code B ref 52420); Sat, 11 Dec 2021 08:17:01 +0000 Original-Received: (at 52420) by debbugs.gnu.org; 11 Dec 2021 08:17:00 +0000 Original-Received: from localhost ([127.0.0.1]:48468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvxYx-0003gh-VK for submit@debbugs.gnu.org; Sat, 11 Dec 2021 03:17:00 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:35616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvxYs-0003gQ-PA for 52420@debbugs.gnu.org; Sat, 11 Dec 2021 03:16:58 -0500 Original-Received: from [2001:470:142:3::e] (port=49378 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvxYn-0000vR-HQ; Sat, 11 Dec 2021 03:16:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=I6lvuKgTMrXMUhkZFj7qLeiw/tjo3YY6hJ/r2JxQwMs=; b=r9dlgNoL8a0Z LX+/Ph+b2G4GqEWkBbX79nAv9HLXXdsUTEpNdIdpXjr4D+TDg1yfihhG7BAswfiTpMFyCTmJnyLpN pNNLuaEy64uDL/3SzwgXOAuIZE+e/VSjeGEDEUIMoqcG/yiaiRvBfk3C9uSlU5DJDpfzMIPrjq/dv 5dDi5fWDk+cvEp6m8cXTzZSy1YiB/GcoIgKKWj9bBoNx4fqdKKcwXKJhZQhKXips+dV9VeqT1xfg6 vWzznbAbSel5rEWu/u8nNOs9G7meqj3QRDyvm0ZiuHlz1uX3Ou32B140EwL387L/gUOphQgtxNMGU iCQAVnJlbO6qp+BkdAGezA==; Original-Received: from [87.69.77.57] (port=2248 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 1mvxYn-0001KD-7T; Sat, 11 Dec 2021 03:16:49 -0500 In-Reply-To: (message from Stefan Kangas on Sat, 11 Dec 2021 01:30:01 +0000) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:222110 Archived-At: > From: Stefan Kangas > Date: Sat, 11 Dec 2021 01:30:01 +0000 > > In admin/release-branch.txt, step 4 says: > > Set the version on the master branch to the next major release: > > M-x set-version RET XY+1.0.50 RET > > This creates a new file etc/NEWS.XY. "git add" it. > > I think the instructions should be changed so that the NEWS file is > moved like this: > > git mv etc/NEWS etc/NEWS.NN > > And then committed in a single commit. This way, git will be able to > track it as a rename and we preserve the ability to use git blame, etc. > > I'm not sure if any changes will have to be made to set-version in > admin/admin.el. I think we should modify admin.el to use "git mv" and commit that (after prompting), instead of calling rename-file etc. that it does today. IOW, there should be no need to do the above manually.