From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Brian Leung Newsgroups: gmane.emacs.bugs Subject: bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits Date: Fri, 09 Dec 2022 12:01:08 +0000 Message-ID: <87fsdordjw.fsf@posteo.net> References: <87mt7wrgyf.fsf@posteo.net> <87wn70keyq.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; format=flowed Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20978"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 59921@debbugs.gnu.org To: Po Lu , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 09 13:02:30 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1p3c5F-0005Cs-Ku for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 09 Dec 2022 13:02:29 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3c59-0007yD-G3; Fri, 09 Dec 2022 07:02:24 -0500 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 1p3c55-0007x9-Pf for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 07:02:20 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3c4o-0003Ea-7b for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 07:02:18 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3c4n-0006vA-Vh for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 07:02:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Brian Leung Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 09 Dec 2022 12:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59921 X-GNU-PR-Package: emacs Original-Received: via spool by 59921-submit@debbugs.gnu.org id=B59921.167058731326598 (code B ref 59921); Fri, 09 Dec 2022 12:02:01 +0000 Original-Received: (at 59921) by debbugs.gnu.org; 9 Dec 2022 12:01:53 +0000 Original-Received: from localhost ([127.0.0.1]:35615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3c4f-0006uw-LD for submit@debbugs.gnu.org; Fri, 09 Dec 2022 07:01:53 -0500 Original-Received: from mout02.posteo.de ([185.67.36.66]:41045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3c4c-0006un-3E for 59921@debbugs.gnu.org; Fri, 09 Dec 2022 07:01:51 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 96995240106 for <59921@debbugs.gnu.org>; Fri, 9 Dec 2022 13:01:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1670587304; bh=nKt8AqPL0hHn18GrTmB7B3CqCykUnfy5FqsPe+cURTE=; h=From:To:Cc:Subject:Date:From; b=mbG+DAkijSe9EIBpaAd+KfgXj2WLFkXA1itqMQ+vXAD0b1wM90eDghM9I4jzvgrkQ 8a7jF9wF4Zgf9r+GFxT6RO5Kupimr5v05EPfYXVhZq3CI7z/aNkgweCQxVr0EPum2w S2KYgP1Xp08JNHVxzzSzAdBv9OJ7sHJ8quBOjWyVmLNclY3wbV29vGp7uy57xI4S94 wxPAv2VxUbuYKfyQ0+6Kz5nbftwxi3PVvLK6zE0gjhbG70GNKVpUo/E9XJzUfI2CE/ Y36NaSC8sjcJCeWog+5aqnpsaMN9vf37NZr6T2Hap1V7FzAF9hwpaZuPoYUXfxeTtB PyQ0nLFSlmWRQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NT8kr6Zvnz6tmf; Fri, 9 Dec 2022 13:01:40 +0100 (CET) In-reply-to: <87wn70keyq.fsf@yahoo.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:250384 Archived-At: Po Lu writes: > Brian Leung writes: > >> The merge commit 2f0bd8167c0 by Po Lu seems to be where this >> started. > > I just ran "M-x gitmerge" and then started the merge from there. > What > could've gone wrong? Sorry, I think I made a mistake. Merge commit 64c7b57ae72 by Eli seems to be the actual culprit.