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: Re: Heads up: skipping a couple commits when merging emacs-29 to master Date: Thu, 6 Apr 2023 11:05:01 -0700 Message-ID: References: <6118b0ee-964e-87b0-cf62-c1a9eea28fe3@gmail.com> <83fs9dqp5o.fsf@gnu.org> 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="5903"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Apr 06 20:07:05 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 1pkU0n-0001Ng-F8 for ged-emacs-devel@m.gmane-mx.org; Thu, 06 Apr 2023 20:07:05 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkTyw-0001dB-8l; Thu, 06 Apr 2023 14:05:10 -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 1pkTyt-0001VM-Rl for emacs-devel@gnu.org; Thu, 06 Apr 2023 14:05:07 -0400 Original-Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pkTyr-0000oE-Pn; Thu, 06 Apr 2023 14:05:07 -0400 Original-Received: by mail-pl1-x62a.google.com with SMTP id le6so38221161plb.12; Thu, 06 Apr 2023 11:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680804302; x=1683396302; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=+BB3Gvx3ytcvUXnFOcIuZLicjoDGbB42bdb0A52AFjA=; b=QQpgqJvm4RE7aPa8/hXZxxnFKEMx0CCdx2YgYrahVy7+gp2jQq+wkJuMNqY9I33k7y hj6vn/YXs8HK0fbmZY8hr67wd74CRxVffK6kaXigdI0ztWcQD3B8xtRiq6LxmKH91EfE 2o+6n43u0ySvyE5qQLkDkhWl3txgDClZMoD6YUbAKvZTP1JcUT+FILX4KraH5rffnrPu cDd+7Da8xEhWg9DjsXC1WnDWPP7azBRbFS8KrWiqX9Cn+GliPjZ07x62+M/PvjbKmqOZ pT/MCGPbAk8SvZEBqQ2k0HW9Mjk6gONPPEmlGNb/EFPrgZwM67s4vdtmFLZVA9GkuTDN X6NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680804302; x=1683396302; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+BB3Gvx3ytcvUXnFOcIuZLicjoDGbB42bdb0A52AFjA=; b=YHkUFvoNvvwm+ARbCsFt/niZ1ZlzDYxehpiLCSl3R9ds43uqJGfJRkD/WWZxh/6xBM cE6wkoPkrt4NJJ/JfVq5/UKPqqp8kLrk3yx1nCThZXSoAogdrDBkSWBZvz3DHJiTrgDr fJPqzfIULeYqg1XNG5fAzYtS/6ZHr5SSkvZKHbaPNDrymuk9sAbHO0YIM0FLHcQcpO8J wL04EvhySyueJaCASEqNBt4W9RurT7gajBZoHFGhxp2+a5IO47cRve69D/RHP4INm2Sn 9d0PMaVlDAUohF6lYTNB7KION9JxhFLkuyBeJjdgXJQQIuEEZWNYAppzHEtIP/Cxvp6Y wSEA== X-Gm-Message-State: AAQBX9cnpBSscDDLpJ1fM1mCszGJEgnvhXaE1PkuqeWqfwoc8dqRdzT1 N7zVwQZzAygLY0PawR7SEKr1aV5p9Cm6Vg== X-Google-Smtp-Source: AKy350aOKX486ZR6+gBIw6JSlmU05l0HS90QSwnkyuG1BB2QlDNfnelayfvHNsgVH7JO+Xqivo9p2Q== X-Received: by 2002:a17:90b:3807:b0:240:883:8ff8 with SMTP id mq7-20020a17090b380700b0024008838ff8mr12560808pjb.3.1680804301641; Thu, 06 Apr 2023 11:05:01 -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 j3-20020a17090adc8300b002369d3b282csm1438568pjv.40.2023.04.06.11.05.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 06 Apr 2023 11:05:01 -0700 (PDT) Content-Language: en-US In-Reply-To: <83fs9dqp5o.fsf@gnu.org> Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=jporterbugs@gmail.com; helo=mail-pl1-x62a.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:305148 Archived-At: On 4/6/2023 3:29 AM, Eli Zaretskii wrote: >> Date: Sun, 2 Apr 2023 15:13:12 -0700 >> From: Jim Porter >> >> 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? 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.