From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.devel Subject: Heads up: skipping a couple commits when merging emacs-29 to master Date: Sun, 2 Apr 2023 15:13:12 -0700 Message-ID: <6118b0ee-964e-87b0-cf62-c1a9eea28fe3@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29703"; mail-complaints-to="usenet@ciao.gmane.io" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Apr 03 00:14:15 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 1pj5xn-0007cz-Ry for ged-emacs-devel@m.gmane-mx.org; Mon, 03 Apr 2023 00:14:15 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pj5wx-0002Pw-SR; Sun, 02 Apr 2023 18:13:24 -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 1pj5wt-0002PY-4L for emacs-devel@gnu.org; Sun, 02 Apr 2023 18:13:19 -0400 Original-Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pj5wq-0007BW-3L for emacs-devel@gnu.org; Sun, 02 Apr 2023 18:13:18 -0400 Original-Received: by mail-pl1-x62f.google.com with SMTP id w4so26238483plg.9 for ; Sun, 02 Apr 2023 15:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680473593; x=1683065593; h=content-transfer-encoding:subject:from:to:content-language :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=v6Rc6dfnbDzv/TPS96GYD5isqbXX683OuFXgjSIgNhk=; b=Vrj2nqsdbccsFzgeZK2fZLGXMKGzI2EqMCZULxvT+SXNXYUFDDCPehjml1z6e7qucd 9HGByXpuhxXFGP88qEeGJ1FmpfGjKEBBv54PowDyrKTMhS69yjHxYYYAzQpFTTUrHp70 NGSnzXoSMomcCmkySCRe9teSeUeHT7dFcawsIcUtSeRmlSSJRovGlsL+BlNQw+4f9m+X rNJLVeLuytHU13psvI16AhYBT5w4NbeOUWJ/9vySo290bgC751Pei6w0/4fz4+cb9cS3 vDYaIkpac4KNUKigwLreZQX1NqW6UodTaZUCoZgkvreF+/76kWrB8VOCJ20Ai9dBcYYT RjEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680473593; x=1683065593; h=content-transfer-encoding:subject:from:to:content-language :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=v6Rc6dfnbDzv/TPS96GYD5isqbXX683OuFXgjSIgNhk=; b=DER4Q9jyArgiYUcNBWTmxtOYy5NKJVRTmOxdk2yPDv3VuDChQKcyY66I50DslobGXW pe+E1Qy9tBxm5lf+wcCbe4oCAhAzpBMBlXPWxKTXE5qyz1Btfvi+3tM6N25U5hIVqVVN sAvuvIhAl21JCCQ12BAsgXFeI3x75+p/GJehbBZq9xTl52tehyZe9mqlPwVSrdbKOnXI ks1lRxBONYXtBRn0apjtQ8iTVF+ZZyNdvG+cGCp0HyEYt29CrcS2GUrFUETFlRYoiLC5 9O3i1RaYdowE7QJkMpSeHZ75O4Xt1JSTuaQPVMdQOafdlF2bMgHgmLM2Qszf6bYCvsDu bIgQ== X-Gm-Message-State: AAQBX9fKLRYoPp3Ngev6CWRWHpse4hevHMkZiaRWOWTeYMjKNZkUCS7s KMxSGFohECy/V82cbKyT/PK+uANeeiM= X-Google-Smtp-Source: AKy350YocJix+KwOKiBolWppwneA8wZxdPDXCYQRdJ5IHljxu43xdRRwCq/77Nskx8Q7yhsn4yGUnw== X-Received: by 2002:a17:90a:52:b0:23d:9a3:f571 with SMTP id 18-20020a17090a005200b0023d09a3f571mr39064084pjb.20.1680473593483; Sun, 02 Apr 2023 15:13:13 -0700 (PDT) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id mh11-20020a17090b4acb00b0023cfbe7d62esm17249971pjb.1.2023.04.02.15.13.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 02 Apr 2023 15:13:13 -0700 (PDT) X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=jporterbugs@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:305053 Archived-At: 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.