From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#52420: admin/release-branch.txt: move NEWS in single commit Date: Sun, 26 Dec 2021 17:52:28 -0800 Message-ID: References: <83r1ajr1y1.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000000d7c0805d416f59b" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14377"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: 52420@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 27 02:53:10 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 1n1fCH-0003Wu-HM for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 27 Dec 2021 02:53:09 +0100 Original-Received: from localhost ([::1]:43066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1fCF-0005Vz-Sd for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 26 Dec 2021 20:53:07 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:46358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1fCA-0005Vk-Ri for bug-gnu-emacs@gnu.org; Sun, 26 Dec 2021 20:53:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1fCA-0004pv-IF for bug-gnu-emacs@gnu.org; Sun, 26 Dec 2021 20:53:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1fCA-0000Ml-Dq for bug-gnu-emacs@gnu.org; Sun, 26 Dec 2021 20:53:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 27 Dec 2021 01:53:02 +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.16405699571363 (code B ref 52420); Mon, 27 Dec 2021 01:53:02 +0000 Original-Received: (at 52420) by debbugs.gnu.org; 27 Dec 2021 01:52:37 +0000 Original-Received: from localhost ([127.0.0.1]:41938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1fBl-0000Lt-4z for submit@debbugs.gnu.org; Sun, 26 Dec 2021 20:52:37 -0500 Original-Received: from mail-pl1-f178.google.com ([209.85.214.178]:39926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1fBj-0000LY-3m for 52420@debbugs.gnu.org; Sun, 26 Dec 2021 20:52:35 -0500 Original-Received: by mail-pl1-f178.google.com with SMTP id h6so6586428plf.6 for <52420@debbugs.gnu.org>; Sun, 26 Dec 2021 17:52:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:in-reply-to:references:user-agent :mime-version:date:message-id:subject:to:cc; bh=ouIRs0EjvIUdXljrb6geIzO9IfFRwshKGbf/5kvxF0I=; b=O+939kwCNAwJ546O975JpudYMsNy5lfLwHxG6Wf4iH/Csg8r19DEG+8BgLHkGnOPLr 4RG2A2852J85omv/zyQ9X/ltu5fM79gfJcn2ZAkks0Rz/FWCZbdCztRMvnYdc9f9I8p/ B1zLMVIwDhkqmhhjd/WfKpw5j22mhzL6ZDqHwpzKTgfMaSpsYeXgFbXRslrAZZN9Bz1h bc5H+XnAEYKcffDPau9es3GgDHzAp1VLLKPIOWSvWvya5nUWPSiDPwySYPq3zWZYaH54 sIOcWO9sI0qQjpzJNdkSr0R76ExoIrz+1Li2QqKhADkmH2hiInwrMlo3xnlTmiHRVzFR QEaQ== X-Gm-Message-State: AOAM532WxypDQzAi4uuH7Jo/L5sgySY7RjEEBnejh2VQ5LNiEYRB57DI aMEHYlQtwoXKuTTpJtvsym8dNc4uuj49QC8sF1o= X-Google-Smtp-Source: ABdhPJxVrvLcAjWl+npECJ5O1DZjZSAAU7Bsmeq+cizjkIRUeMTXdwIFM2oIiSb0cQ90Tcyca1EW2V/6b7QXBdK2mII= X-Received: by 2002:a17:90b:1646:: with SMTP id il6mr18734951pjb.143.1640569949220; Sun, 26 Dec 2021 17:52:29 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 26 Dec 2021 17:52:28 -0800 In-Reply-To: <83r1ajr1y1.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 11 Dec 2021 10:16:38 +0200") 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:223170 Archived-At: --0000000000000d7c0805d416f59b Content-Type: text/plain; charset="UTF-8" tags 52420 + patch thanks Eli Zaretskii writes: > 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. How does the attached patch look? --0000000000000d7c0805d416f59b Content-Type: text/x-diff; charset="US-ASCII"; name="0001-admin.el-Move-etc-NEWS-to-etc-NEWS.NN-in-one-commit.patch" Content-Disposition: attachment; filename="0001-admin.el-Move-etc-NEWS-to-etc-NEWS.NN-in-one-commit.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: 7e1b24d9279edb00_0.1 RnJvbSAxNTMwNjA3NjZhYmM5NmU0Yzc3ODczZjliZjMzMDVlNWQ0NDk1NWJjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5AbWFyeGlzdC5zZT4KRGF0 ZTogTW9uLCAyNyBEZWMgMjAyMSAwMjo0NDoyNyArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIGFkbWlu LmVsOiBNb3ZlIGV0Yy9ORVdTIHRvIGV0Yy9ORVdTLk5OIGluIG9uZSBjb21taXQKCiogYWRtaW4v YWRtaW4uZWwgKGFkbWluLWdpdC1jb21tYW5kKTogTmV3IHZhcmlhYmxlLgooc2V0LXZlcnNpb24p OiBNb3ZlIGV0Yy9ORVdTIHRvIGV0Yy9ORVdTLk5OIGFuZCBwcm9tcHQgdG8gY29tbWl0Cml0LiAg KEJ1ZyM1MjQyMCkKLS0tCiBhZG1pbi9hZG1pbi5lbCB8IDEzICsrKysrKysrKysrKy0KIDEgZmls ZSBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEv YWRtaW4vYWRtaW4uZWwgYi9hZG1pbi9hZG1pbi5lbAppbmRleCBhZDQyMDhiZWVmLi41NWMzNjk0 ZjNjIDEwMDY0NAotLS0gYS9hZG1pbi9hZG1pbi5lbAorKysgYi9hZG1pbi9hZG1pbi5lbApAQCAt ODgsNiArODgsOSBAQCBzZXQtdmVyc2lvbi1pbi1maWxlCiAgICAgKGtpbGwtYnVmZmVyKQogICAg IChtZXNzYWdlICJObyBuZWVkIHRvIHVwZGF0ZSBgJXMnIiBmaWxlKSkpCiAKKyhkZWZ2YXIgYWRt aW4tZ2l0LWNvbW1hbmQgKGV4ZWN1dGFibGUtZmluZCAiZ2l0IikKKyAgIlRoZSBgZ2l0JyBwcm9n cmFtIHRvIHVzZS4iKQorCiAoZGVmdW4gc2V0LXZlcnNpb24gKHJvb3QgdmVyc2lvbikKICAgIlNl dCBFbWFjcyB2ZXJzaW9uIHRvIFZFUlNJT04gaW4gcmVsZXZhbnQgZmlsZXMgdW5kZXIgUk9PVC4K IFJvb3QgbXVzdCBiZSB0aGUgcm9vdCBvZiBhbiBFbWFjcyBzb3VyY2UgdHJlZS4iCkBAIC05Niw2 ICs5OSw4IEBAIHNldC12ZXJzaW9uCiAJCShyZWFkLXN0cmluZyAiVmVyc2lvbiBudW1iZXI6ICIg ZW1hY3MtdmVyc2lvbikpKQogICAodW5sZXNzIChmaWxlLWV4aXN0cy1wIChleHBhbmQtZmlsZS1u YW1lICJzcmMvZW1hY3MuYyIgcm9vdCkpCiAgICAgKHVzZXItZXJyb3IgIiVzIGRvZXNuJ3Qgc2Vl bSB0byBiZSB0aGUgcm9vdCBvZiBhbiBFbWFjcyBzb3VyY2UgdHJlZSIgcm9vdCkpCisgICh1bmxl c3MgYWRtaW4tZ2l0LWNvbW1hbmQKKyAgICAodXNlci1lcnJvciAiQ291bGQgbm90IGZpbmQgZ2l0 IGluIGBleGVjLXBhdGgnIikpCiAgIChtZXNzYWdlICJTZXR0aW5nIHZlcnNpb24gbnVtYmVycy4u LiIpCiAgIDs7IFRoZXJlJ3MgYWxzbyBhICJ2ZXJzaW9uIDMiIChzdGFuZGluZyBmb3IgR1BMdjMp IGF0IHRoZSBlbmQgb2YKICAgOzsgYFJFQURNRScsIGJ1dCBzaW5jZSBgc2V0LXZlcnNpb24taW4t ZmlsZScgb25seSByZXBsYWNlcyB0aGUgZmlyc3QKQEAgLTE1Nyw3ICsxNjIsMTMgQEAgc2V0LXZl cnNpb24KIERvY3VtZW50YXRpb24gY2hhbmdlcyBtaWdodCBub3QgaGF2ZSBiZWVuIGNvbXBsZXRl ZCEiKSkpKQogICAgICh3aGVuIChhbmQgbWFqb3JidW1wCiAgICAgICAgICAgICAgICAobm90IChm aWxlLWV4aXN0cy1wIG9sZG5ld3NmaWxlKSkpCi0gICAgICAocmVuYW1lLWZpbGUgbmV3c2ZpbGUg b2xkbmV3c2ZpbGUpCisgICAgICAoY2FsbC1wcm9jZXNzIGFkbWluLWdpdC1jb21tYW5kIG5pbCBu aWwgbmlsCisgICAgICAgICAgICAgICAgICAgICJtdiIgbmV3c2ZpbGUgb2xkbmV3c2ZpbGUpCisg ICAgICAod2hlbiAoeS1vci1uLXAgIkNvbW1pdCBtb3ZlIG9mIE5FV1MgZmlsZT8iKQorICAgICAg ICAoY2FsbC1wcm9jZXNzIGFkbWluLWdpdC1jb21tYW5kIG5pbCBuaWwgbmlsCisgICAgICAgICAg ICAgICAgICAgICAgImNvbW1pdCIgIi1tIiAoZm9ybWF0ICI7IE1vdmUgZXRjLyVzIHRvIGV0Yy8l cyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZpbGUtbmFt ZS1ub25kaXJlY3RvcnkgbmV3c2ZpbGUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIChmaWxlLW5hbWUtbm9uZGlyZWN0b3J5IG9sZG5ld3NmaWxlKSkpKQogICAg ICAgKGZpbmQtZmlsZSBvbGRuZXdzZmlsZSkgICAgICAgICAgIDsgdG8gcHJvbXB0IHlvdSB0byBj b21taXQgaXQKICAgICAgIChjb3B5LWZpbGUgb2xkbmV3c2ZpbGUgbmV3c2ZpbGUpCiAgICAgICAo d2l0aC10ZW1wLWJ1ZmZlcgotLSAKMi4zMC4yCgo= --0000000000000d7c0805d416f59b--