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 09:52:14 +0200 Message-ID: <83r0x7y9u9.fsf@gnu.org> References: <87r0x8rie6.fsf@posteo.net> <87bkocrbfe.fsf@posteo.net> <83h6y4zi5r.fsf@gnu.org> <878rjgdqlc.fsf@posteo.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27239"; mail-complaints-to="usenet@ciao.gmane.io" Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org To: Brian Leung Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 10 08:53:22 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 1p3ufi-0006sB-Ke for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 10 Dec 2022 08:53:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3ufQ-0004jB-QZ; Sat, 10 Dec 2022 02:53: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 1p3ufP-0004j2-1u for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 02:53:03 -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 1p3ufO-0008WG-IT for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 02:53:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3ufN-0005Pf-UP for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 02:53:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 10 Dec 2022 07:53: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.167065875220800 (code B ref 59921); Sat, 10 Dec 2022 07:53:01 +0000 Original-Received: (at 59921) by debbugs.gnu.org; 10 Dec 2022 07:52:32 +0000 Original-Received: from localhost ([127.0.0.1]:41256 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3uet-0005PQ-KI for submit@debbugs.gnu.org; Sat, 10 Dec 2022 02:52:32 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:37794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3ueq-0005PK-G1 for 59921@debbugs.gnu.org; Sat, 10 Dec 2022 02:52:30 -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 1p3uek-000779-E1; Sat, 10 Dec 2022 02:52:22 -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=zoiqNuVzxZivxdJXY5T8c128od/xZqJgDO8RPpCwAeA=; b=Wo6UTnk3Mkeq 8mMWS00b5NFc+qzHf7RaH66Zl3sZKK589C5C+1+PxBQwwxTk402A/0TJGgd8GckWkqhFwd/nww44F w9C8zCcusv55X6qKn7uFB178Lbk5eGgJzif5JJFCey/mUv3CwPYgkeuN8CPStmoBLnHhv2NmFfPt0 3xv+PE0SQasakGX5SSD1EINOiiatUCn14Zf8zjyC9K92htkAg3hjl16LutAXNCMIxTix5wW6eUNh5 Br7hwfkAvdfe5qPR2DQRqm2ZumJE99OLkM+S8BbyGrkXtAbNnXgLL/ohLT6LHFf+7OK2MVq/ABTY5 7z9Wa2MWSj9WJOfqMQBzqg==; 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 1p3uef-0005YA-OQ; Sat, 10 Dec 2022 02:52:19 -0500 In-Reply-To: <878rjgdqlc.fsf@posteo.net> (message from Brian Leung on Sat, 10 Dec 2022 00:43:38 +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:250492 Archived-At: > From: Brian Leung > Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org > Date: Sat, 10 Dec 2022 00:43:38 +0000 > > 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 Which is correct, since 508b0c1b22 was cherry-picked from master. > The tree-sitter-related changes I mentioned earlier in the thread > are not present in 64c7b57ae726f6483921db5f6daeda8ada162666. The commits _are_ present, according to Git, but the corresponding changes to the worktree aren't. Is that what you mean above? > However, if you check out 508b0c1b22, you will find that the > tree-sitter-related changes indeed exist there. Again, what do you mean by "check out 508b0c1b22" (how to check and on which branch), and what do you mean by "changes indeed exist there"? Given the above ambiguity and the fact that we have two branches, please be very specific when you say such thing, to avoid any misunderstandings and confusion. This issue is confusing enough already. > 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. So you are saying that this problem is due to a bug in gitmerge.el? If not, what do you mean by "by mistake"? I didn't merge any commits manually, I invoked "M-x gitmerge", and it didn't report any problems except with merging emacs-29/NEWS master/NEWS.29. So who made the mistakes you suspect here? > 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. You are saying that all of the above commits don't have their changes in master? How did you generate the above list? Thanks.