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 00:43:38 +0000 Message-ID: <878rjgdqlc.fsf@posteo.net> References: <87r0x8rie6.fsf@posteo.net> <87bkocrbfe.fsf@posteo.net> <83h6y4zi5r.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="14886"; 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 01:57:26 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 1p3oBB-0003hC-Qa for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 10 Dec 2022 01:57:25 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3oAp-0002Sa-RR; Fri, 09 Dec 2022 19:57:03 -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 1p3oAo-0002SD-8y for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 19:57: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 1p3oAo-0005qf-1U for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 19:57:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3oAn-0000kq-U5 for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 19:57: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: Sat, 10 Dec 2022 00:57: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.16706337782855 (code B ref 59921); Sat, 10 Dec 2022 00:57:01 +0000 Original-Received: (at 59921) by debbugs.gnu.org; 10 Dec 2022 00:56:18 +0000 Original-Received: from localhost ([127.0.0.1]:39508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3oA6-0000jz-3A for submit@debbugs.gnu.org; Fri, 09 Dec 2022 19:56:18 -0500 Original-Received: from mout01.posteo.de ([185.67.36.65]:46997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3oA3-0000jo-M1 for 59921@debbugs.gnu.org; Fri, 09 Dec 2022 19:56:16 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2266F240026 for <59921@debbugs.gnu.org>; Sat, 10 Dec 2022 01:56:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1670633770; bh=eHfQs3h7yafsuYTngQAqfZow2fHkOOocIyDoDYBVNPQ=; h=From:To:Cc:Subject:Date:From; b=Imz9mQuFREKxtZnF+H3de2hEOIBjX0sKlWQKWHWwocfVF4rU7eGwZE9EXtlYYUpbh 6yQ1SCean0pJSvF15jDpJ3W79x4e/qRw4DxpSHQ6htu/4BSzIr/3+iss+21hBOxSt4 87syaH9vICVsFf31NfHq+N3MJFBH9zv3NR1USKuor8GpqpA9xM9kVILA7BtpKNg0Wd aP2uCgHPVWry/mlgIRD9hKyPC5pApRgktPtN87coHtYzMIw8H31/b4VL4tkSS2ykRC GLM5QfwyRkY22/VpNJ5MsuVi/mSQX4FZXei+JAYCZVS/1bheTLqn7COOSWscoFfy8a g0MRUgn0V6DVg== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NTTwR4vgSz9rxB; Sat, 10 Dec 2022 01:56:06 +0100 (CET) In-reply-to: <83h6y4zi5r.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:250477 Archived-At: Eli Zaretskii writes: >> Cc: 59921@debbugs.gnu.org >> From: Brian Leung >> Date: Fri, 09 Dec 2022 12:43:12 +0000 >> >> >> > Doesn't this mean that these commits are on the master >> > branch? >> >> I arrived at a similar conclusion using Magit. I don't have a >> great understanding of Git, so my best guess is that >> 64c7b57ae72 >> somehow skipped over more commits than expected. You can verify >> that the changes corresponding to the missing commits are >> present >> in the emacs-29 branch but not in master. > > How did you detect the missing changes in the first place? To be extra clear about what I think happened, 64c7b57ae726f6483921db5f6daeda8ada162666, which was a merge from emacs-29, has a commit message that reads: > The following commit was skipped: > > 508b0c1b22 Fix crash on Windows 9X The tree-sitter-related changes I mentioned earlier in the thread are not present in 64c7b57ae726f6483921db5f6daeda8ada162666. However, if you check out 508b0c1b22, you will find that the tree-sitter-related changes indeed exist there. In the emacs-29 branch, 508b0c1b22 is a descendant of the tree-sitter-related changes, so any merge commit that merged 508b0c1b22 into master ought to have merged any ancestors of 508b0c1b22 as well. But 508b0c1b22 was intentionally skipped, and some of its ancestors seem to have been skipped by mistake as well. 508b0c1b223 | * | Fix crash on Windows 9X 670daa8b626 | * | Add recursion limit to treesit--children-covering-range-recurse b429e524288 | * | Improve tree-sitter fontification in edge-cases (bug#59738) c83c95634e7 | * | Add c-ts-mode-indent-defun (bug#59662) 6479691cf07 | * | Fix syntax-table for tree-sitter modes b710ca62c00 | * | c++-ts-mode: Highlight nullptr as a constant d31a2539834 | * | Improve parameter checking in tree-sitter functions a669d5fae54 | * | ; * test/lisp/comint-tests.el (w32-application-type): Fix typo. f7262b8f81e | * | Fix comint-tests on MS-Windows fef17557365 | * | Use new external-completion.el in Eglot bf81df86e52 | * | Don't override completion-category-defaults in fido-mode 4bc9c8972ac | * | Add lisp/external-completion.el for completions from external tools bfc00f1c120 | * | Eglot: fix setting of flymake-list-only-diagnostics (bug#59824) d2411615e8b | * | * test/src/sqlite-tests.el (sqlite-version): Declare. A few of the above commits had their corresponding changes make their way into the current master (for example, 4bc9c8972ac, which added the external-completion stuff). However, fef17557365, which began to use the external-completion.el package in eglot, is present in emacs-29 but not in master. I cannot see any mention of external-completion package when looking at eglot.el in the master branch, whereas I see it prominently mentioned in the Package-Requires when I check out the emacs-29 branch.