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 21:46:57 +0300 Message-ID: <83lej4q25a.fsf@gnu.org> References: <6118b0ee-964e-87b0-cf62-c1a9eea28fe3@gmail.com> <83fs9dqp5o.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18295"; 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 20:47:11 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 1pkUda-0004SJ-W5 for ged-emacs-devel@m.gmane-mx.org; Thu, 06 Apr 2023 20:47:11 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkUcx-0005VP-PP; Thu, 06 Apr 2023 14:46:31 -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 1pkUcu-0005V7-U0 for emacs-devel@gnu.org; Thu, 06 Apr 2023 14:46:29 -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 1pkUcu-0003qJ-Ew; Thu, 06 Apr 2023 14:46:28 -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=N32xyBxwbClZqmEUZKBeFjlgABOqx7WwFi/KYXc0XvI=; b=bKcu79rB/WiS FRvmuZGS9rB9TzcoSuiwY0s1Ptb4pzKfmHfjqsHt/gT4wkC8T9et8CTUjmcp2WgUc65tyW3FxuMD4 kDZ7vLDalCswFUP2ONn2F97uhcfj2YiDKgr7X7mWurs+Gw7302c3dR6mS4Pgl1Q0BVG3HCaoF+Asp k5/V3nUkxFb6x/HuV4AZZBBa5cUOZaPYwS8Zs6eF9UTbgclkYCKfDBuvch+mbgSDR6UQzk2Twa8Du wUCE1xeHJ15a6/Ncgrs7Yg65RTFChZx7IK83tLiI+FCyghMzsff9LcUSnbYEkwK7LoL6fJHr+jNZe iysTf9ub5q5eAVBAjFKMBA==; 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 1pkUct-0005OF-VQ; Thu, 06 Apr 2023 14:46:28 -0400 In-Reply-To: (message from Jim Porter on Thu, 6 Apr 2023 11:05:01 -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:305149 Archived-At: > Date: Thu, 6 Apr 2023 11:05:01 -0700 > Cc: emacs-devel@gnu.org > From: Jim Porter > > On 4/6/2023 3:29 AM, Eli Zaretskii wrote: > >> 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. Yes, you are right. I've done the merge now.