all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Jim Porter <jporterbugs@gmail.com>
To: emacs-devel@gnu.org
Subject: Heads up: skipping a couple commits when merging emacs-29 to master
Date: Sun, 2 Apr 2023 15:13:12 -0700	[thread overview]
Message-ID: <6118b0ee-964e-87b0-cf62-c1a9eea28fe3@gmail.com> (raw)

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.



             reply	other threads:[~2023-04-02 22:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-02 22:13 Jim Porter [this message]
2023-04-06 10:29 ` Heads up: skipping a couple commits when merging emacs-29 to master Eli Zaretskii
2023-04-06 18:05   ` Jim Porter
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6118b0ee-964e-87b0-cf62-c1a9eea28fe3@gmail.com \
    --to=jporterbugs@gmail.com \
    --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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.