[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 13:29:55 +0300 |
> Date: Sun, 2 Apr 2023 15:13:12 -0700
> From: Jim Porter <jporterbugs@gmail.com>
>
> In bug#62556, I merged some separate patches for emacs-29 and master. On
> the emacs-29 branch, there were a few test failures that were fixed in
> followups by both Eli and me, but I don't think the commits were marked
> as "Do not merge to master".
>
> 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?