From: Stefan Kangas <stefankangas@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Moving etc/NEWS around causing release branch merge to fail again
Date: Tue, 13 Dec 2022 15:34:09 -0800 [thread overview]
Message-ID: <CADwFkmkp5BnkLgS9QCd4FNAnQz4e5x2RqT_FaubrRzAc9P0new@mail.gmail.com> (raw)
In-Reply-To: <CADwFkmkCwP2jZZRhFyWzNB3J-Aa9jd4cVuD+Vzd5wERZyatZoQ@mail.gmail.com>
Stefan Kangas <stefankangas@gmail.com> writes:
> Eli Zaretskii <eliz@gnu.org> writes:
>
>> 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.
>
> Thanks, I'll try a manual merge next time.
It happened again. I spent an hour trying to fix the merge this time,
and doing it manually with `M-x gitmerge' got me nowhere. NEWS was
still being modified, and it didn't prompt me about NEWS. I ended up
just fixing up NEWS manually after the merge, which is what I'll do from
here on out.
BTW, when doing manual merges, can everyone please try to make sure that
etc/NEWS is *not* modified, or fix it manually. Merges with `M-x
gitmerge' are prone to such errors, as there are no automatic checks in
place for modifying NEWS, in the case where there are no git merge
conflicts. See the FIXME in admin/gitmerge.el.
(Such a mistake was made in commit 6d6ca47aba7b, where the NEWS entry
added in 8f49137c9bf was merged into the etc/NEWS file on master.
I've fixed that in commit f1840cf12fda.)
next prev parent reply other threads:[~2022-12-13 23:34 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
2022-12-08 22:20 ` Stefan Kangas
2022-12-13 23:34 ` Stefan Kangas [this message]
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=CADwFkmkp5BnkLgS9QCd4FNAnQz4e5x2RqT_FaubrRzAc9P0new@mail.gmail.com \
--to=stefankangas@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@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).