From: Eli Zaretskii <eliz@gnu.org>
To: leungbk@posteo.net
Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org
Subject: bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits
Date: Sat, 10 Dec 2022 13:30:22 +0200 [thread overview]
Message-ID: <835yejxzqp.fsf@gnu.org> (raw)
In-Reply-To: <83r0x7y9u9.fsf@gnu.org> (message from Eli Zaretskii on Sat, 10 Dec 2022 09:52:14 +0200)
> Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org
> Date: Sat, 10 Dec 2022 09:52:14 +0200
> From: Eli Zaretskii <eliz@gnu.org>
>
> > 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?
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.
next prev parent reply other threads:[~2022-12-10 11:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-09 10:17 bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits Brian Leung
2022-12-09 10:46 ` Brian Leung
2022-12-09 11:13 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 12:01 ` Brian Leung
2022-12-09 12:28 ` Stefan Kangas
2022-12-09 12:43 ` Brian Leung
2022-12-09 15:54 ` Eli Zaretskii
2022-12-09 21:08 ` Brian Leung
2022-12-10 7:22 ` Eli Zaretskii
2022-12-10 0:43 ` Brian Leung
2022-12-10 7:52 ` Eli Zaretskii
2022-12-10 11:30 ` Eli Zaretskii [this message]
2022-12-10 11:36 ` Brian Leung
2022-12-10 14:22 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=835yejxzqp.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=59921@debbugs.gnu.org \
--cc=leungbk@posteo.net \
--cc=stefankangas@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.