From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Heads up: skipping a couple commits when merging emacs-29 to master Date: Thu, 06 Apr 2023 13:29:55 +0300 Message-ID: <83fs9dqp5o.fsf@gnu.org> References: <6118b0ee-964e-87b0-cf62-c1a9eea28fe3@gmail.com> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36845"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Jim Porter Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Apr 06 12:30:07 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pkMsZ-0009Nc-7Y for ged-emacs-devel@m.gmane-mx.org; Thu, 06 Apr 2023 12:30:07 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkMrx-0007uW-3d; Thu, 06 Apr 2023 06:29:29 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pkMrv-0007uI-2w for emacs-devel@gnu.org; Thu, 06 Apr 2023 06:29:27 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pkMru-0001Nl-Qu; Thu, 06 Apr 2023 06:29:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=OoD3dfTBLaRVqb/nuFV1Tc0boKEdwTD4aZzTH2Yrv6k=; b=Kb+Y/c/BC9HY Blpvms30ItNLqxQ7rgt4pFt1xbNk/wQcFf2aRG1C4+CoG6s903kMMiofQ+s7JXSQnrrNh3SqugwaO 2kig366g4SYFtiaOg7NTyF9ne2o29UhVx2fmytVFbWXVVDwIMTn27Vuyt+/L1b1p2xUmPHo6706Bj iHapxWejK9LuS4gZwebJNa4LnbPB95Cn5ETTVUMPjLkU2JAfACaJCcLeTvypgQuOx3F1bU+Z6w6ob vhexYAKxzpgRBxmKgfS1bcdZjocDFpqSkOmCeWvNyeW3M53Pf8/Ji794ii/b5I2k8SEvN5btq19ou J+JJbPbhJaGEaQRQ8sOtTw==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pkMru-0000qZ-58; Thu, 06 Apr 2023 06:29:26 -0400 In-Reply-To: <6118b0ee-964e-87b0-cf62-c1a9eea28fe3@gmail.com> (message from Jim Porter on Sun, 2 Apr 2023 15:13:12 -0700) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:305141 Archived-At: > Date: Sun, 2 Apr 2023 15:13:12 -0700 > From: Jim Porter > > 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?