[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging release branch
From: |
Glenn Morris |
Subject: |
Re: Merging release branch |
Date: |
Sat, 06 Nov 2021 12:14:34 -0400 |
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Stefan Kangas wrote:
> (I don't know how Glenn has done it until now.)
Using the tools in the Emacs repository, and documented in eg
admin/notes/git-workflow
> AFAIK, there is no strong need to name that file etc/NEWS until we
> create a tarball or run "make install". I think we should just keep the
> file in etc/NEWS.NN even on the release branch. That would avoid the
> merging headache, and the file would also preserve its full history
> between versions (no more moving the file).
See previous discussions in eg
https://lists.gnu.org/r/emacs-devel/2017-12/msg00340.html
https://debbugs.gnu.org/29366