From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Kangas <stefankangas@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: Moving etc/NEWS around causing release branch merge to fail again
Date: Thu, 08 Dec 2022 20:08:03 +0200 [thread overview]
Message-ID: <83mt7x22gs.fsf@gnu.org> (raw)
In-Reply-To: <CADwFkmk7xEKqVsZfDb_oJNKZTh+_QnYsHYFD8YbjuphzRB+diA@mail.gmail.com> (message from Stefan Kangas on Thu, 8 Dec 2022 07:49:48 -0800)
> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Thu, 8 Dec 2022 07:49:48 -0800
>
> Merging the release branch is failing due to our practice of moving
> etc/NEWS around again. Here's what I see:
>
> $ ./admin/automerge -r -n 1 -b -t -p
> Resetting...
> Pulling...
> Merging...
> merged ok
> automerge: etc/NEWS has been modified
>
> I'll see if I can find the time and energy to investigate this today,
> but otherwise it might be a couple of days until I'll merge emacs-29 to
> master again. If anyone knows what's going on, please fix it or even
> better tell me which steps to take.
I did the merge.
I don't use admin/automerge, I use admin/gitmerge.el in an interactive
session. It asked me whether to try resolving conflicts in NEWS; I
answered YES. Then it said it finished successfully. I compared
NEWS.29 on master with NEWS on the release branch, and saw that the
entry for external-completion-table was lost; so I added it manually
to NEWS.29.
Maybe the way gitmerge.el attempts to fix the conflicts in NEWS is
unreliable, and we should always do that manually? OTOH, fixing such
probl;ems with NEWS is easy: in case there are too many diffs, just
copy NEWS from the branch to NEWS.29 on master, and commit that.
Do we edit NEWS.29 on master, ever? If we do, we should refrain from
doing that.
next prev parent reply other threads:[~2022-12-08 18:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-08 15:49 Moving etc/NEWS around causing release branch merge to fail again Stefan Kangas
2022-12-08 18:08 ` Eli Zaretskii [this message]
2022-12-08 22:20 ` Stefan Kangas
2022-12-13 23:34 ` Stefan Kangas
2022-12-14 3:42 ` Eli Zaretskii
2022-12-14 5:32 ` Stefan Kangas
2022-12-14 16:01 ` Eli Zaretskii
2022-12-31 22:42 ` Yuan Fu
2023-01-01 6:30 ` Eli Zaretskii
2023-01-01 23:23 ` Yuan Fu
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=83mt7x22gs.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=stefankangas@gmail.com \
/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).