From: Jim Porter <jporterbugs@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Heads up: skipping a couple commits when merging emacs-29 to master
Date: Thu, 6 Apr 2023 11:05:01 -0700 [thread overview]
Message-ID: <cfe2e120-8617-1b43-3fe6-063f2817bb42@gmail.com> (raw)
In-Reply-To: <83fs9dqp5o.fsf@gnu.org>
On 4/6/2023 3:29 AM, Eli Zaretskii wrote:
>> Date: Sun, 2 Apr 2023 15:13:12 -0700
>> From: Jim Porter <jporterbugs@gmail.com>
>>
>> Since emacs-29 and master handle these tests in different ways, merging
>> those followups will probably fail, so (I think) they should be skipped.
>> The commits SHAs to skip are:
>>
>> 21a4ee209c19031e29e98e4308aa9d67890a0515
>> 46209b2453b1a53fcf0019f6e1a21b7fef85bcbc
>> 89e337c3fc9a51454afb86176a507f46c198be9f
>>
>> Thanks, and sorry for any difficulties with merging.
>
> Could you please verify that those commits were indeed not merged, or
> that they merged correctly?
As far as I can tell, those commits haven't been merged and master looks
ok right now.
However, I'm not sure if that's just because no one's tried to merge
them yet. I thought when a commit was skipped, the merge commit would
say, "The following commits were skipped," listing the skipped commits.
However, I don't see that in c108132d3bb69d0cc8d2e0222a781dff9abca087,
which is the only merge commit from emacs-29 -> master that I see in the
right time range.
next prev parent reply other threads:[~2023-04-06 18:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-02 22:13 Heads up: skipping a couple commits when merging emacs-29 to master Jim Porter
2023-04-06 10:29 ` Eli Zaretskii
2023-04-06 18:05 ` Jim Porter [this message]
2023-04-06 18:46 ` Eli Zaretskii
2023-04-06 19:24 ` Jim Porter
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=cfe2e120-8617-1b43-3fe6-063f2817bb42@gmail.com \
--to=jporterbugs@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).