unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Kangas <stefan@marxist.se>
Cc: 52420@debbugs.gnu.org
Subject: bug#52420: admin/release-branch.txt: move NEWS in single commit
Date: Sat, 11 Dec 2021 10:16:38 +0200	[thread overview]
Message-ID: <83r1ajr1y1.fsf@gnu.org> (raw)
In-Reply-To: <CADwFkm=Ta97NP+U1TtD-HaiyDFFWJw0+OoncaUMFWWagZMYpZg@mail.gmail.com> (message from Stefan Kangas on Sat, 11 Dec 2021 01:30:01 +0000)

> From: Stefan Kangas <stefan@marxist.se>
> 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.





  reply	other threads:[~2021-12-11  8:16 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-11  1:30 bug#52420: admin/release-branch.txt: move NEWS in single commit Stefan Kangas
2021-12-11  8:16 ` Eli Zaretskii [this message]
2021-12-11 10:19   ` Stefan Kangas
2021-12-27  1:52   ` Stefan Kangas
2021-12-27 14:21     ` Eli Zaretskii
2021-12-27 16:11       ` Stefan Kangas
2021-12-27 16:50         ` Eli Zaretskii
2021-12-27 17:32           ` Stefan Kangas
2021-12-27 17:56             ` Eli Zaretskii
2021-12-27 19:50               ` Stefan Kangas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83r1ajr1y1.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=52420@debbugs.gnu.org \
    --cc=stefan@marxist.se \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).