From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits Date: Fri, 09 Dec 2022 19:13:01 +0800 Message-ID: <87wn70keyq.fsf@yahoo.com> References: <87mt7wrgyf.fsf@posteo.net> Reply-To: Po Lu Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21382"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 59921@debbugs.gnu.org To: Brian Leung Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 09 12:14:07 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 1p3bKQ-0005Ow-W1 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 09 Dec 2022 12:14:07 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3bKO-0000R9-9G; Fri, 09 Dec 2022 06:14:04 -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 1p3bKM-0000Qv-S9 for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 06:14:02 -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 1p3bKM-0003ua-KQ for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 06:14:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3bKM-0006F1-Cb for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 06:14:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Po Lu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 09 Dec 2022 11:14:02 +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.167058440523975 (code B ref 59921); Fri, 09 Dec 2022 11:14:02 +0000 Original-Received: (at 59921) by debbugs.gnu.org; 9 Dec 2022 11:13:25 +0000 Original-Received: from localhost ([127.0.0.1]:35382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3bJl-0006Ed-I4 for submit@debbugs.gnu.org; Fri, 09 Dec 2022 06:13:25 -0500 Original-Received: from sonic304-21.consmr.mail.ne1.yahoo.com ([66.163.191.147]:43115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3bJi-0006EU-Ix for 59921@debbugs.gnu.org; Fri, 09 Dec 2022 06:13:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1670584396; bh=Vz4GzHGCL97VOW0fHZg9D3gOCibhLi3PeAz/6SuNOE4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=YrS97gecZukhLMw5VRfUuFnaLsz7C8cRkDsZVwzBjkYbQCoAXdguI9Mok61LRFBhz/Mi6kVNX6MX8DvwBboo1Sj5kkOSu1gZvSWkukZqHiflPZ6tEvwc7GkZDt2/tRMHJkCIarEWkon/yV2Rzy/TBcL4uImu4CZ9JTPXpgcu7dSmgxIhCdRjTdUQMs5rEoIkbXkFk8c/vAZP+tJKGwMJ6f1qvvIXfMY7pdRREYiUlfHz0/PInHx4nGXFL7vadygQpWg3xjuk4+rUiFOTOTsbBvT8sZc8MhkEOPcJpXDEABKmNYXLsI7TfL269tVxGvvjCetzzFW63P0joWCvAOpT8w== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1670584396; bh=yyh1yRKy5Gn59mgd/ns8NlvMNpIjB9aFeEkfVnKX5F4=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=Za4+SkBLuF1bmjE2xijykjwCmPCpkSz/WAaFj0jPCcE7KcGUFSzIAnrfpC+jVT92v5deSfnjfPw3mpXXHOU0n7d4ExpeQhJLI+lb4gz3SX2Nqo7PN4z/ClXSbXO6pPyyZGLfZmZ05UvT19nGahdeLIqTYJ7RHUCaIEYsL7o6f9YUEWJBWKgkHyiV6Twt4HcXDnT/qz5VoH1VbJIcf7HtevciyZYDIQKmLjWOL1HhQKEmH68whVnhZweFZQKDE2iaR/ZvfY9CNKbK6BngxfttzoU37ZDDuiXXfwTgdNGsvsAi+CxegLZLYGgXir7kVzQf9RHzZd85gAUZ5EWNgVn5Bw== X-YMail-OSG: h.ocDiAVM1kAQvDL7AEJDeGbCw1xoU1zZnnVR9awKSrYTo8Arlz1PYMOW98hCzS NZg05Xa3v_xmJPxIoVkyWd28FgdeGc9pz3S5YetEihNa.Slt2Yr8yJN3TbE.wBUHBJVOhwRpXkmu tOIggeNq__oJXVjqjlqThsPeQrkaO_GQhzr0jbLg8Hy26.bh4xabodMFpOG6L6TMeEWiqJsN.H8x NdDuEnYTicLerPsZT0.HqmFnu8UJKxST6K.7i8eWeUhy4CtBXol_X9BKbAR5g8zq.EOct0owztj5 AKlR.nculMrUpolHax..GbJCxPlJxyMJ00qHw7xt_RFsptdcwIcfXmuqK3misWmG9pagM.046ez5 ddhpoZIjDq7HOeWbHYHu_77HdhmWOR3Ls5W8_xfAXvkj0W9EG6X3IN5eu7LWZ3khwtSDmOSR_QYB wBDR7QmUTIIwTQzcCgFhdkNgVOsX_xzt_UXwIIu_hbe.ptwllalwPwTXScaZnruVYFC1Lb4Oxy5H A7rlZlFaiDKcz4sDaT4q8zPpyC9FtCGuA7dguDkd0Gvac.FevCmXUaogZgsadN68jsxkE0K2nbqr OMoF35sNm_KfTbbTJg8V6aFLDIUIEexhsMvzvVL5OWtuzbTu2GULeyWslw8LPp.2d_eauNek78cQ Foz1Bzei_TDEMrkSE86VhZ.e5kQ6S0kjMC8qnozwuQ02rr1nZ.AzWeLUOOTwcueH2sPxmXgjMhPY 3mpc1ysm9AzE4uCh5I8OJS8fmU2XLOoc01tky7k5dVgaaxI4OzDEga0p2I.GCdg2P_5jA3Kv3Q99 R4x7Q0eQ5.6fYrWmt4D30P2OAAYAtfSSAsYmV2paud X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.ne1.yahoo.com with HTTP; Fri, 9 Dec 2022 11:13:16 +0000 Original-Received: by hermes--production-sg3-b666c6484-8hzhs (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 4a9abe609fb0739e76688688e1de3b6a; Fri, 09 Dec 2022 11:13:09 +0000 (UTC) In-Reply-To: <87mt7wrgyf.fsf@posteo.net> (Brian Leung's message of "Fri, 09 Dec 2022 10:46:38 +0000") X-Mailer: WebService/1.1.20926 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo 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:250379 Archived-At: 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?