From: Stefan Kangas <stefankangas@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>, Glenn Morris <rgm@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Merging release branch
Date: Sat, 6 Nov 2021 03:53:07 -0700 [thread overview]
Message-ID: <CADwFkmnyzsSUuR+NWTcZu6fcY22MKo4q722ZRZyZpJYScMzB7A@mail.gmail.com> (raw)
In-Reply-To: <83o86xbpkk.fsf@gnu.org>
Eli Zaretskii <eliz@gnu.org> writes:
> What's the procedure with merging commits that change etc/NEWS on the
> release branch? gitmerge.el insists on trying to merge those in
> etc/NEWS for the next release, which is not TRT. One could skip the
> commits which change only etc/NEWS and then "merge" manually by
> copying branch/etc/NEWS into trunk/etc/NEWS.28, but isn't there a
> better way? And why doesn't gitmerge.el do that automatically?
(I don't know how Glenn has done it until now.)
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).
If we want to do this, our build-scripts depend on there being an
etc/NEWS file, so they would need to be updated.
next prev parent reply other threads:[~2021-11-06 10:53 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 16:35 Merging release branch Glenn Morris
2021-10-29 16:42 ` Lars Ingebrigtsen
2021-10-29 17:01 ` Stefan Kangas
2021-10-29 18:10 ` Stefan Monnier
2021-10-29 18:26 ` Lars Ingebrigtsen
2021-10-29 18:52 ` Lars Ingebrigtsen
2021-10-29 19:55 ` Daniel Martín
2021-10-30 11:42 ` Lars Ingebrigtsen
2021-10-30 13:42 ` Daniel Martín
2021-10-30 20:32 ` Tassilo Horn
2021-10-29 19:58 ` Eli Zaretskii
2021-10-30 11:51 ` Lars Ingebrigtsen
2021-10-30 12:11 ` Eli Zaretskii
2021-10-30 12:30 ` Dmitry Gutov
2021-10-30 12:32 ` Eli Zaretskii
2021-10-30 13:34 ` dick
2021-10-31 11:38 ` Dmitry Gutov
2021-10-31 13:03 ` Eli Zaretskii
2021-10-30 16:33 ` Eli Zaretskii
2021-10-30 21:36 ` Dmitry Gutov
2021-10-31 7:19 ` Eli Zaretskii
2021-10-30 23:14 ` Gregory Heytings
2021-10-30 23:17 ` Dmitry Gutov
2021-10-31 7:20 ` Eli Zaretskii
2021-10-31 8:13 ` Gregory Heytings
2021-10-31 11:40 ` Dmitry Gutov
2021-10-31 12:58 ` Gregory Heytings
2021-10-31 21:59 ` Dmitry Gutov
2021-10-31 14:46 ` Lars Ingebrigtsen
2021-10-31 15:12 ` Eli Zaretskii
2021-10-31 15:15 ` Lars Ingebrigtsen
2021-10-31 16:02 ` Dealing with merge noise (was: Merging release branch) Kévin Le Gouguec
2021-10-31 18:19 ` Stefan Kangas
2021-10-31 18:31 ` Eli Zaretskii
2021-10-31 22:00 ` Merging release branch Dmitry Gutov
2021-10-30 12:31 ` Lars Ingebrigtsen
2021-10-30 12:48 ` Eli Zaretskii
2021-10-29 19:00 ` Stefan Monnier
2021-10-29 19:05 ` Lars Ingebrigtsen
2021-10-29 19:17 ` Stefan Monnier
2021-10-29 20:29 ` David Engster
2021-10-29 17:08 ` dick
2021-11-06 9:28 ` Eli Zaretskii
2021-11-06 10:53 ` Stefan Kangas [this message]
2021-11-06 16:14 ` Glenn Morris
2021-11-06 16:11 ` Glenn Morris
2021-11-06 17:19 ` Eli Zaretskii
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADwFkmnyzsSUuR+NWTcZu6fcY22MKo4q722ZRZyZpJYScMzB7A@mail.gmail.com \
--to=stefankangas@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.