bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits

[Eli Zaretskii]

> From: Brian Leung <leungbk@posteo.net>
> 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.