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: Sat, 10 Dec 2022 11:36:10 +0000 Message-ID: <874ju3ebge.fsf@posteo.net> 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> 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="3177"; mail-complaints-to="usenet@ciao.gmane.io" Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 10 12:38:36 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 1p3yBf-0000aB-TQ for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 10 Dec 2022 12:38:36 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3yBH-0003eD-6q; Sat, 10 Dec 2022 06:38:11 -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 1p3yB9-0003dZ-0v for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 06:38:05 -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 1p3yB8-0008Lj-PN for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 06:38:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3yB8-0000ib-9y for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 06:38:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Brian Leung Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 10 Dec 2022 11:38: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.16706722722753 (code B ref 59921); Sat, 10 Dec 2022 11:38:02 +0000 Original-Received: (at 59921) by debbugs.gnu.org; 10 Dec 2022 11:37:52 +0000 Original-Received: from localhost ([127.0.0.1]:42283 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3yAy-0000iL-IO for submit@debbugs.gnu.org; Sat, 10 Dec 2022 06:37:52 -0500 Original-Received: from mout02.posteo.de ([185.67.36.66]:55853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3yAt-0000i1-Ny for 59921@debbugs.gnu.org; Sat, 10 Dec 2022 06:37:49 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0B159240104 for <59921@debbugs.gnu.org>; Sat, 10 Dec 2022 12:37:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1670672262; bh=uL8i3BZiZ1dmPFCYaHFCPHVNkuzLc1g3wCU9vLKYtWc=; h=From:To:Cc:Subject:Date:From; b=kXt5awqvsKfxAAgmkLymNPeGdP/CYrF8zKFk0TUVgSRHC0jMa5R4YR4H8RGAFhX/o dw/8TuBp2SLxC16gygaRInOB2N4iDf8rxlLigtb7Pl+hFK4Phv0w48Ozp87DQDiz+Q AgLMxO/CrvzmHiJj7tU/pol1dznFxnxpIUeIUxpKqOeFCgz7qmzMg2sEed/XfCraAv 2PY4QAVt9ioKUoUrxHvGvVBpcwJiLrKkklFJXaF8R8bkPUK5VFhmh9QeyxxuvFksoi 33Wb9cw9JYKCz3RWrhMzHa8m9iNojO55JDfHvrreENjITDqKA4KiOvE4hvyP34Qizu n0P1tRskZ70Dw== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NTm8h5ybbz9rxG; Sat, 10 Dec 2022 12:37:40 +0100 (CET) In-reply-to: <835yejxzqp.fsf@gnu.org> 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:250508 Archived-At: 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.