From: Glenn Morris <rgm@gnu.org>
To: 29366@debbugs.gnu.org
Subject: bug#29366: gitmerge to handle NEWS better
Date: Tue, 23 Oct 2018 13:10:09 -0400 [thread overview]
Message-ID: <5hr2ggfv2m.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <pebmj3z5qe.fsf@fencepost.gnu.org> (Glenn Morris's message of "Tue, 12 Dec 2017 22:06:33 -0500")
Today I noticed that this still goes wrong sometimes.
See the obvious mistake in
http://lists.gnu.org/rl/emacs-diffs/2018-10/msg00163.html
where a change ends up in etc/NEWS when it should have gone to NEWS.26.
(Presumably this means git somehow merged it without a conflict?
I have no idea how it could merge it to that position.)
See also the other corrections I then found to be needed in
http://lists.gnu.org/r/emacs-diffs/2018-10/msg00165.html
I guess I repeat my comments from
http://lists.gnu.org/r/emacs-devel/2017-12/msg00340.html
1) It's a shame there's no proper rename tracking
2) Perhaps etc/NEWS should always be called etc/NEWS.MAJORVERSION right
from the start, with etc/NEWS being just a symlink.
next prev parent reply other threads:[~2018-10-23 17:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 18:16 bug#29366: gitmerge to handle NEWS better Glenn Morris
2017-12-11 19:11 ` Glenn Morris
2017-12-11 23:18 ` David Engster
2017-12-11 23:33 ` Glenn Morris
2017-12-12 20:10 ` David Engster
2017-12-13 3:06 ` Glenn Morris
2018-10-23 17:10 ` Glenn Morris [this message]
2018-10-23 17:23 ` Eli Zaretskii
2018-10-23 17:35 ` 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
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=5hr2ggfv2m.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=29366@debbugs.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 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).