[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Heads up: skipping a couple commits when merging emacs-29 to master
From: |
Eli Zaretskii |
Subject: |
Re: Heads up: skipping a couple commits when merging emacs-29 to master |
Date: |
Thu, 06 Apr 2023 21:46:57 +0300 |
> Date: Thu, 6 Apr 2023 11:05:01 -0700
> Cc: emacs-devel@gnu.org
> From: Jim Porter <jporterbugs@gmail.com>
>
> On 4/6/2023 3:29 AM, Eli Zaretskii wrote:
> >> 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.
Yes, you are right. I've done the merge now.