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.bugs Subject: bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits Date: Sat, 10 Dec 2022 16:22:50 +0200 Message-ID: <83lenfwd6t.fsf@gnu.org> References: <87r0x8rie6.fsf@posteo.net> <87bkocrbfe.fsf@posteo.net> <83h6y4zi5r.fsf@gnu.org> <878rjgdqlc.fsf@posteo.net> <83r0x7y9u9.fsf@gnu.org> <835yejxzqp.fsf@gnu.org> <874ju3ebge.fsf@posteo.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19004"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 59921-done@debbugs.gnu.org, stefankangas@gmail.com To: Brian Leung Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 10 15:24: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 1p40mE-0004gn-63 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 10 Dec 2022 15:24:30 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p40ls-0006YJ-CO; Sat, 10 Dec 2022 09:24:08 -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 1p40lo-0006Xg-Iq for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 09:24:04 -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 1p40lm-00077I-5J for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 09:24:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p40lm-0007d3-0j for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 09:24:02 -0500 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 10 Dec 2022 14:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 59921 X-GNU-PR-Package: emacs Mail-Followup-To: 59921@debbugs.gnu.org, eliz@gnu.org, leungbk@posteo.net Original-Received: via spool by 59921-done@debbugs.gnu.org id=D59921.167068218529304 (code D ref 59921); Sat, 10 Dec 2022 14:24:01 +0000 Original-Received: (at 59921-done) by debbugs.gnu.org; 10 Dec 2022 14:23:05 +0000 Original-Received: from localhost ([127.0.0.1]:43024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p40kr-0007ca-44 for submit@debbugs.gnu.org; Sat, 10 Dec 2022 09:23:05 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:47478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p40km-0007by-0p for 59921-done@debbugs.gnu.org; Sat, 10 Dec 2022 09:23:03 -0500 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 1p40kg-0006z9-MF; Sat, 10 Dec 2022 09:22:54 -0500 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=L1eeMA/ZlIWVX178vVxZ5MLUkNTbR+P4whHLTqfW9fo=; b=sRXo1GvslvMu Tn7Ol2nuVe/FXTFNuymMHBHsXVQVGx/UWrgDYdrNtbV025i64zc47YYJHgiCI0T2XFxpT89fvmNTU 7Nl7e2PDUWuQOmsiVxLdKY0KjxWVmt4ZFZx5di1wjd0i98V5ZVCYYhQ5qh5qsQTUR4N5WrD59fapW BVJ4WmlWjN9M1pLYFhBRkA8tmQGWC6UQBe+oglVjfRZJvJAFlwYoT/BoCCw7GMX/Avdf2Q1Hzcrxw mAI8idDHq2cAuZM/daXogA3dqf4uu3daa182e1k09JwQMiCyVVZ6tnhG7TF6YRv9HzPOpEM/oFIhg oZZg4u56NLeeH6MkydOWIQ==; 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 1p40kg-0000It-1n; Sat, 10 Dec 2022 09:22:54 -0500 In-Reply-To: <874ju3ebge.fsf@posteo.net> (message from Brian Leung on Sat, 10 Dec 2022 11:36:10 +0000) 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:250524 Archived-At: > From: Brian Leung > Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org > Date: Sat, 10 Dec 2022 11:36:10 +0000 > > > Eli Zaretskii writes: > > > I've went over all of the above commits, and manually committed > > changes of those of them which appeared to be missing from the > > master > > branch. > > > > I have no idea how this happened. I guess we have some subtle > > bug in > > gitmerge.el, perhaps triggered by the situations like the one at > > that > > merge, where a feature branch which was not forked from our Git > > repository was merged piecemeal into the release branch. > > Thanks for looking into this. I think we can close this now, > though I'm not sure how to do so here on debbugs. Like I did now (look at the addresses).