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

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

[Brian Leung]

For example,
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=c83c95634e7a8d0f334ac5d45eebf357e413906c
and
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=b710ca62c00ef90a46fc90a9ae06fdf3bba87bc2
are not in Emacs 30, at the time of writing, whereas some newer Emacs 29
commits are on master.


In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo
version 1.16.0, Xaw3d scroll bars)
Repository revision: 8c01829c01ca81c990eadf34bc16794b65d62c70
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12014000
System Description: NixOS 23.05 (Stoat)

Configured using:
 'configure
 --prefix=/nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0
 --disable-build-details --with-modules --with-x-toolkit=lucid
 --with-xft --with-cairo --with-native-compilation'

Configured features:
CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON
LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NATIVE_COMP NOTIFY
INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF
TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XAW3D XDBE XIM XPM LUCID ZLIB

Important settings:
  value of $EMACSLOADPATH: 
  value of $EMACSNATIVELOADPATH: /nix/store/76kfyrm634snbsahl042hdvflawx3ihj-emacs-packages-deps/share/emacs/native-lisp::
  value of $LANG: en_US.UTF8
  locale-coding-system: utf-8-unix

Major mode: Magit

Minor modes in effect:
  global-git-commit-mode: t
  magit-auto-revert-mode: t
  radian-universal-keyboard-quit-mode: t
  bug-reference-mode: t
  global-auto-revert-mode: t
  winner-mode: t
  desktop-environment-mode: t
  beginend-global-mode: t
  beginend-magit-status-mode: t
  editorconfig-mode: t
  marginalia-mode: t
  company-prescient-mode: t
  prescient-persist-mode: t
  global-company-mode: t
  company-mode: t
  nix-modeline-mode: t
  org-roam-db-autosync-mode: t
  mu4e-column-faces-mode: t
  global-hl-todo-mode: t
  global-whitespace-cleanup-mode: t
  global-subword-mode: t
  subword-mode: t
  global-origami-mode: t
  origami-mode: t
  pdfgrep-mode: t
  global-git-gutter-mode: t
  evil-owl-mode: t
  global-evil-fringe-mark-mode: t
  global-evil-surround-mode: t
  evil-surround-mode: t
  global-evil-matchit-mode: t
  evil-lion-mode: t
  evil-traces-mode: t
  global-evil-mc-mode: t
  evil-mc-mode: t
  evil-escape-mode: t
  evil-goggles-mode: t
  global-evil-collection-unimpaired-mode: t
  evil-collection-unimpaired-mode: t
  evil-mode: t
  evil-local-mode: t
  windmove-mode: t
  yas-global-mode: t
  yas-minor-mode: t
  global-page-break-lines-mode: t
  doom-modeline-mode: t
  display-time-mode: t
  npm-global-mode: t
  npm-mode: t
  repeat-mode: t
  envrc-global-mode: t
  envrc-mode: t
  dired-async-mode: t
  helm-adaptive-mode: t
  async-bytecomp-package-mode: t
  recentf-mode: t
  vertico-indexed-mode: t
  vertico-mode: t
  minibuffer-electric-default-mode: t
  eshell-vterm-mode: t
  eshell-syntax-highlighting-global-mode: t
  save-place-mode: t
  global-undo-fu-session-mode: t
  global-dash-fontify-mode: t
  shell-dirtrack-mode: t
  server-mode: t
  savehist-mode: t
  minibuffer-depth-indicate-mode: t
  el-patch-use-package-mode: t
  global-display-line-numbers-mode: t
  general-override-mode: t
  straight-use-package-mode: t
  straight-package-neutering-mode: t
  straight-live-modifications-mode: t
  global-eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  buffer-read-only: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  abbrev-mode: t

Load-path shadows:
/home/brian/.config/emacs/straight/build/ivy/elpa hides /home/brian/.config/emacs/straight/build/lispy/elpa
/home/brian/.config/emacs/straight/build/cmake-mode/cmake-mode hides /etc/profiles/per-user/brian/share/emacs/site-lisp/cmake-mode
/home/brian/.config/emacs/straight/build/password-store/password-store hides /etc/profiles/per-user/brian/share/emacs/site-lisp/password-store
/home/brian/.config/emacs/straight/build/vterm/vterm-autoloads hides /nix/store/76kfyrm634snbsahl042hdvflawx3ihj-emacs-packages-deps/share/emacs/site-lisp/elpa/vterm-20221118.1354/vterm-autoloads
/home/brian/.config/emacs/straight/build/vterm/vterm hides /nix/store/76kfyrm634snbsahl042hdvflawx3ihj-emacs-packages-deps/share/emacs/site-lisp/elpa/vterm-20221118.1354/vterm
/etc/profiles/per-user/brian/share/emacs/site-lisp/site-start hides /nix/store/76kfyrm634snbsahl042hdvflawx3ihj-emacs-packages-deps/share/emacs/site-lisp/site-start
/etc/profiles/per-user/brian/share/emacs/site-lisp/site-start hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/site-lisp/site-start
/home/brian/.config/emacs/straight/build/transient/transient hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/transient
/home/brian/.config/emacs/straight/build/use-package/use-package-lint hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/use-package/use-package-lint
/home/brian/.config/emacs/straight/build/bind-key/bind-key hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/use-package/bind-key
/home/brian/.config/emacs/straight/build/use-package/use-package-jump hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/use-package/use-package-jump
/home/brian/.config/emacs/straight/build/use-package/use-package-diminish hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/use-package/use-package-diminish
/home/brian/.config/emacs/straight/build/use-package/use-package-delight hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/use-package/use-package-delight
/home/brian/.config/emacs/straight/build/use-package/use-package-ensure hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/use-package/use-package-ensure
/home/brian/.config/emacs/straight/build/use-package/use-package-bind-key hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/use-package/use-package-bind-key
/home/brian/.config/emacs/straight/build/use-package/use-package-core hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/use-package/use-package-core
/home/brian/.config/emacs/straight/build/use-package/use-package hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/use-package/use-package
/home/brian/.config/emacs/straight/build/xref/xref hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/progmodes/xref
/home/brian/.config/emacs/straight/build/project/project hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/progmodes/project
/home/brian/.config/emacs/straight/build/soap-client/soap-client hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/net/soap-client
/home/brian/.config/emacs/straight/build/soap-client/soap-inspect hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/net/soap-inspect
/home/brian/.config/emacs/straight/build/map/map hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/emacs-lisp/map
/home/brian/.config/emacs/straight/build/let-alist/let-alist hides /nix/store/nd0r6yfaxb73mkgs82kqhqkg68f0axqj-emacs-git-20221209.0/share/emacs/30.0.50/lisp/emacs-lisp/let-alist

Features:
(shadow emacsbug deadgrep spinner tramp-archive tramp-gvfs magit-patch
magit-subtree magit-gitignore nix-mode smie nix-shell nix-store nix-log
nix-instantiate nix-shebang nix-format emmet-mode js java-ts-mode crux
windower evil-matchit-simple evil-matchit-prog misearch multi-isearch
c-ts-mode evil-collection-magit orgit evil-collection-forge forge-list
forge-commands forge-semi forge-bitbucket buck forge-gogs gogs
forge-gitea gtea forge-gitlab glab forge-github ghub-graphql treepy
gsexp ghub url-http url-gw nsm url-auth let-alist forge-notify
forge-revnote forge-pullreq forge-issue forge-topic yaml forge-post
forge-repo forge forge-core forge-db closql magit-tbdiff magit-extras
vdiff-magit magit-ediff evil-collection-ediff ediff ediff-merg
ediff-mult ediff-wind ediff-diff ediff-help ediff-init ediff-util
magit-bookmark magit-submodule magit-obsolete magit-blame magit-stash
magit-reflog magit-bisect magit-push magit-pull magit-fetch magit-clone
magit-remote magit-commit magit-sequence magit-notes magit-worktree
magit-tag magit-merge magit-branch magit-reset magit-files magit-refs
magit-status magit magit-repos magit-apply magit-wip magit-log
which-func magit-diff git-commit log-edit pcvs-util add-log magit-core
magit-autorevert magit-margin magit-transient magit-process magit-mode
magit-git magit-base crm em-smart em-tramp em-script em-prompt em-glob
em-basic eshell-toggle mm-archive sort smiley gnus-cite mail-extr
textsec uni-scripts idna-mapping ucs-normalize uni-confusable
textsec-check qp evil-collection-view view tramp-cmds pandoc-mode
pandoc-mode-utils evil-collection-helpful elisp-demos helpful cc-langs
trace info-look evil-collection-elisp-refs elisp-refs helm-exwm posframe
executable evil-collection-markdown-mode markdown-preview-mode
web-server web-server-status-codes websocket bindat evil-markdown
markdown-mode jka-compr citre citre-global citre-tags citre-ctags
citre-readtags citre-readtags-tables citre-backend-interface
citre-ui-peek citre-ui-jump citre-common-tag citre-common-util vc-svn
evil-collection-eglot eglot array jsonrpc evil-collection-ert ert ewoc
evil-collection-flymake flymake-proc flymake highlight-indentation
vertico-directory cursor-sensor company-elisp evil-collection-flycheck
flycheck-guile flycheck goto-addr bug-reference pinentry autorevert
winner desktop-environment evil-collection-beginend beginend
editorconfig editorconfig-core editorconfig-core-handle
editorconfig-fnmatch marginalia company-keywords company-dabbrev-code
company-dabbrev company-files company-capf company-restclient
know-your-http-well http-status-codes http-relations http-methods
http-headers company-prescient prescient char-fold company nix-modeline
evil-collection-org-roam org-roam-migrate org-roam-log org-roam-mode
org-roam-capture org-roam-id org-roam-node org-roam-db org-roam-utils
org-roam-compat org-roam org-capture org-attach
evil-collection-magit-section magit-section compat-27 compat-26
org-rich-yank mu4e-alert ht alert log4e notifications gntp
evil-collection-mu4e mu4e-column-faces mu4e mu4e-org mu4e-main mu4e-view
gnus-art mm-uu mml2015 mm-view mml-smime smime gnutls dig gnus-sum
gnus-group gnus-undo gnus-start gnus-dbus dbus gnus-cloud nnimap nnmail
mail-source utf7 nnoo gnus-spec gnus-int gnus-range gnus-win
evil-collection-gnus gnus nnheader range mu4e-headers mu4e-compose
mu4e-draft mu4e-actions smtpmail mu4e-search mu4e-lists mu4e-bookmarks
mu4e-mark mu4e-message shr pixel-fill kinsoku url-file svg xml dom
flow-fill mule-util hl-line mu4e-contacts mu4e-update mu4e-folders
mu4e-server mu4e-context mu4e-vars mu4e-helpers mu4e-config message
sendmail yank-media puny rfc822 mml mml-sec evil-collection-epa epa epg
rfc6068 epg-config gnus-util mm-decode mm-bodies mm-encode mail-parse
rfc2231 rfc2047 rfc2045 mm-util ietf-drums mail-prsvr mailabbrev
mail-utils gmm-utils mailheader hl-todo whitespace-cleanup-mode
whitespace cap-words superword subword origami origami-parsers cl
pdfgrep evil-collection-wgrep wgrep grep git-gutter yasnippet lispyville
evil-owl evil-fringe-mark evil-fringe-mark-overlays fringe-helper
evil-visual-replace evil-surround evil-matchit evil-matchit-evil-setup
evil-matchit-sdk semantic/lex semantic/fw evil-lion evil-textobj-syntax
evil-indent-plus evil-replace-with-register evil-traces evil-args
evil-exchange evil-collection-evil-mc evil-mc evil-mc-command-execute
evil-mc-command-record evil-mc-cursor-make evil-mc-region
evil-mc-cursor-state evil-mc-undo evil-mc-vars evil-mc-known-commands
evil-mc-common evil-escape evil-mark-replace evil-goggles pulse
evil-collection-unimpaired evil-collection-xref evil-collection-vterm
evil-collection-vertico evil-collection-vdiff evil-collection-vc-git
evil-collection-term evil-collection-tabulated-list
evil-collection-shortdoc evil-collection-restclient
evil-collection-python evil-collection-pass evil-collection-org
evil-collection-man evil-collection-help evil-collection-helm
evil-collection-git-timemachine evil-collection-elisp-mode
evil-collection-eldoc evil-collection-edebug evil-collection-embark
evil-collection-debug evil-collection-consult evil-collection-compile
evil-collection-comint calc-ext evil-collection-calc evil-collection
annalist evil-string-inflection string-inflection evil evil-integration
evil-maps evil-commands reveal flyspell ispell evil-jumps
evil-command-window evil-search evil-ex evil-types evil-macros
evil-repeat evil-states evil-core evil-common windmove calc
calc-loaddefs calc-macs rect evil-digraphs evil-vars page-break-lines
doom-modeline doom-modeline-segments doom-modeline-env
doom-modeline-core all-the-icons all-the-icons-faces data-material
data-weathericons data-octicons data-fileicons data-faicons
data-alltheicons shrink-path doom-modeline-autoloads
shrink-path-autoloads doom-themes-ext-org doom-themes-ext-treemacs
doom-themes-ext-visual-bell doom-one-light-theme time doom-themes
doom-themes-base doom-themes-autoloads bundler-autoloads
rspec-mode-autoloads robe-autoloads inf-ruby-autoloads go-mode-autoloads
clojure-mode-autoloads utop-autoloads dune-autoloads tuareg-autoloads
caml-autoloads z3-mode-autoloads haskell-mode-autoloads
bison-mode-autoloads lua-mode-autoloads scribble-mode-autoloads
racket-mode-autoloads macrostep-geiser-autoloads
flycheck-guile-autoloads geiser-racket-autoloads geiser-mit-autoloads
geiser-guile-autoloads geiser-autoloads ess-autoloads jupyter-autoloads
zmq-autoloads simple-httpd-autoloads highlight-indentation-autoloads
pip-requirements-autoloads elixir-autoloads company-restclient-autoloads
know-your-http-well-autoloads php-mode-autoloads jq-mode-autoloads
json-snatcher-autoloads nodejs-repl-autoloads npm-mode
npm-mode-autoloads dotenv-mode-autoloads ts-comint-autoloads
emmet-mode-autoloads zig-mode-autoloads nasm-mode-autoloads
x86-lookup-autoloads cmake-font-lock-autoloads cmake-mode-autoloads
rustic-autoloads xterm-color-autoloads rust-mode-autoloads repl-toggle
fullframe repl-toggle-autoloads fullframe-autoloads make-it-so make-mode
make-it-so-autoloads sx-autoloads gif-screencast-autoloads
elfeed-org-autoloads elfeed-autoloads hackernews-autoloads
company-reftex-autoloads evil-tex-autoloads company-auctex-autoloads
auctex-autoloads tex-site unfill-autoloads symbol-overlay
symbol-overlay-autoloads rainbow-delimiters rainbow-delimiters-autoloads
page-break-lines-autoloads auto-yasnippet-autoloads
consult-yasnippet-autoloads yasnippet-autoloads csv-mode-autoloads
prodigy-autoloads erc-hl-nicks-autoloads flyspell-correct-autoloads
edbi-autoloads epc-autoloads ctable-autoloads concurrent-autoloads
sql-indent-autoloads emms-autoloads dockerfile-mode-autoloads
docker-compose-mode-autoloads yaml-mode-autoloads docker-autoloads
aio-autoloads browse-at-remote-autoloads git-modes-autoloads
orgit-forge-autoloads orgit-autoloads magit-imerge-autoloads
code-review-autoloads emojify-autoloads deferred-autoloads
uuidgen-autoloads a-autoloads forge-autoloads yaml-autoloads
ghub-autoloads treepy-autoloads closql-autoloads emacsql-sqlite emacsql
emacsql-compiler git-timemachine transient vc-git
git-timemachine-autoloads git-link-autoloads git-gutter-autoloads
gitpatch-autoloads magit-tbdiff-autoloads pdfgrep-autoloads
pdf-view-restore-autoloads pdf-tools-autoloads tablist-autoloads
nov-autoloads esxml-autoloads kv-autoloads vimrc-mode-autoloads
macrostep-autoloads el-mock-autoloads ert-runner-autoloads
shut-up-autoloads ansi-autoloads commander-autoloads
elisp-demos-autoloads helpful-autoloads elisp-refs-autoloads
eval-sexp-fu-autoloads highlight-stages-autoloads lispyville-autoloads
lispy lispy-inline avy etags fileloop help-fns radix-tree lispy-tags
mode-local zoutline lispy-autoloads zoutline-autoloads swiper-autoloads
ivy-autoloads lisp-extra-font-lock lisp-extra-font-lock-autoloads
origami-autoloads repeat link-hint-autoloads all-the-icons-autoloads
treemacs-icons-dired-autoloads treemacs-magit-autoloads
treemacs-evil-autoloads treemacs-perspective-autoloads
treemacs-autoloads cfrs-autoloads pfuture-autoloads ace-window-autoloads
avy-autoloads harpoon-autoloads nswbuff-autoloads perspective-autoloads
sesman-autoloads skeletor-autoloads envrc inheritenv envrc-autoloads
inheritenv-autoloads crux-autoloads whitespace-cleanup-mode-autoloads
apheleia apheleia-autoloads hl-todo-autoloads debpaste-autoloads
xml-rpc-autoloads mu4e-column-faces-autoloads mu4e-alert-autoloads
mbsync-autoloads w3m-load w3m-autoloads gnuplot-autoloads
zotero-autoloads oauth-autoloads pandoc-mode-autoloads
markdown-preview-mode-autoloads web-server-autoloads websocket-autoloads
evil-markdown-autoloads markdown-mode-autoloads adoc-mode-autoloads
markup-faces-autoloads deft deft-autoloads org-download-autoloads
org-pomodoro-autoloads alert-autoloads log4e-autoloads gntp-autoloads
org-fancy-priorities-autoloads org-modern-autoloads org-recur-autoloads
org-sidebar-autoloads org-ql-autoloads peg-autoloads ov-autoloads
org-super-agenda-autoloads ts-autoloads ht-autoloads
org-rich-yank-autoloads ob-sql ob-shell ob-scheme ob-ruby ob-restclient
restclient ob-python python treesit ob-org ob-ocaml ob-haskell ob-js
ob-gnuplot ob-eshell ob-C cc-mode cc-fonts cc-guess cc-menus cc-cmds
cc-styles cc-align cc-engine cc-vars cc-defs consult-org org-indent
embark-org org-element org-persist org-id org-refile avl-tree org ob
ob-tangle ob-ref ob-lob ob-table ob-exp org-macro org-src ob-comint
org-pcomplete org-list org-footnote org-faces org-entities noutline
outline ob-emacs-lisp ob-core ob-eval org-cycle org-table ol org-fold
org-fold-core org-keys oc org-loaddefs cal-menu calendar cal-loaddefs
org-version org-compat org-macs ob-restclient-autoloads
restclient-autoloads evil-org-autoloads org-appear-autoloads
org-roam-autoloads emacsql-sqlite-autoloads emacsql-autoloads
org-pandoc-import-autoloads org-tree-slide-autoloads
org-contrib-autoloads wgrep-autoloads deadgrep-autoloads
spinner-autoloads ssh-config-mode-autoloads helm-wikipedia-autoloads
helm-linux-disks-autoloads helm-comint helm-elisp helm-files image-dired
image-dired-tags image-dired-external image-dired-util xdg image-mode
dired-open dired-filter dired-narrow delsel dired-subtree dired-ranger
dired-hacks-utils dired-rsync dired-async dired-aux dired-x dired
dired-loaddefs exif filenotify helm-buffers helm-occur helm-tags
helm-locate helm-grep helm-regexp helm-eval edebug debug backtrace
helm-info helm-utils helm-types helm-help helm-adaptive helm
helm-global-bindings helm-easymenu edmacro helm-core async-bytecomp
helm-source helm-multi-match helm-lib async helm-config
nix-update-autoloads nix-modeline-autoloads helm-nixos-options-autoloads
nixos-options-autoloads nix-repl nix nix-mode-autoloads cape-autoloads
corfu-autoloads consult-dash-autoloads dash-docs-autoloads
citre-autoloads relint-autoloads ample-regexps-autoloads xr-autoloads
run-command-autoloads consult-git-log-grep-autoloads consult-ls-git vc
vc-dispatcher consult-ls-git-autoloads consult-dir-autoloads
consult-recoll-autoloads consult-flycheck-autoloads flycheck-autoloads
pkg-info-autoloads epl-autoloads consult-imenu consult-xref xref project
embark-consult consult-vertico consult compat-28 recentf tree-widget
marginalia-autoloads orderless orderless-autoloads vertico-repeat
vertico-indexed vertico vertico-autoloads company-prescient-autoloads
company-autoloads prescient-autoloads embark-consult-autoloads
consult-autoloads embark ffap thingatpt embark-autoloads minibuf-eldef
exec-path-from-shell exec-path-from-shell-autoloads
editorconfig-autoloads posframe-autoloads evil-owl-autoloads
evil-fringe-mark-autoloads fringe-helper-autoloads
evil-visual-replace-autoloads evil-visualstar-autoloads
evil-surround-autoloads evil-nerd-commenter-autoloads
evil-expat-autoloads evil-matchit-autoloads evil-lion-autoloads
evil-textobj-syntax-autoloads names-autoloads evil-indent-plus-autoloads
evil-replace-with-register-autoloads evil-traces-autoloads
evil-args-autoloads evil-exchange-autoloads evil-numbers-autoloads
evil-multiedit-autoloads iedit-autoloads evil-mc-autoloads
evil-escape-autoloads evil-mark-replace-autoloads evil-goggles-autoloads
evil-collection-autoloads annalist-autoloads
evil-string-inflection-autoloads string-inflection-autoloads
evil-autoloads goto-chg-autoloads pcase beginend-autoloads
desktop-environment-autoloads daemons-autoloads burly-autoloads
map-autoloads windower-autoloads popper-autoloads shackle-autoloads
exwm-edit exwm-edit-autoloads helm-exwm-autoloads helm-autoloads
popup-autoloads helm-core-autoloads exwm-config ido exwm-randr xcb-randr
exwm-systemtray xcb-systemtray xcb-xembed exwm exwm-input xcb-keysyms
xcb-xkb exwm-manage exwm-floating xcb-cursor xcb-render exwm-layout
exwm-workspace exwm-core xcb-ewmh xcb-icccm xcb xcb-xproto xcb-types
xcb-debug kmacro exwm-autoloads xelb-autoloads bluetooth-autoloads
debbugs-autoloads soap-client-autoloads vdiff-magit-autoloads
magit-autoloads magit-section-autoloads git-commit-autoloads
transient-autoloads vdiff smerge-mode diff two-column hydra advice lv
diff-mode vdiff-autoloads hydra-autoloads lv-autoloads
dired-open-autoloads dired-filter-autoloads dired-narrow-autoloads
dired-subtree-autoloads dired-ranger-autoloads
dired-hacks-utils-autoloads dired-rsync-autoloads async-autoloads
fd-dired-autoloads dired-toggle-sudo-autoloads detached-autoloads
eshell-toggle-autoloads eshell-autojump eshell-autojump-autoloads
eshell-up eshell-up-autoloads eshell-prompt-extras
eshell-prompt-extras-autoloads eshell-vterm easy-mmode vterm bookmark
tramp tramp-loaddefs trampver tramp-integration tramp-compat parse-time
iso8601 time-date ls-lisp format-spec face-remap compile color find-func
vterm-module term/xterm xterm eshell-vterm-autoloads
eshell-syntax-highlighting em-alias eshell-syntax-highlighting-autoloads
esh-help man em-unix esh-help-autoloads em-hist em-pred em-ls em-cmpl
em-dirs esh-var esh-mode em-term term disp-table ehelp eshell esh-cmd
generator esh-ext esh-opt esh-proc esh-io esh-arg esh-module esh-groups
esh-util cus-edit pp cus-load wid-edit files-x multi-vterm-autoloads
project-autoloads xref-autoloads saveplace vundo-autoloads
undo-fu-session undo-fu-session-autoloads pinentry-autoloads pass f
f-shortdoc shortdoc text-property-search dash s imenu pass-autoloads
f-autoloads dash-autoloads password-store-otp-autoloads password-store
with-editor comp comp-cstr warnings icons rx shell pcomplete comint
ansi-osc ansi-color ring server password-store-autoloads
with-editor-autoloads s-autoloads auth-source-pass init-misc-settings
savehist mb-depth package-lint-autoloads let-alist-autoloads
el-patch-autoloads el-patch el-patch-stub display-line-numbers compdef
derived compdef-autoloads blackout blackout-autoloads general
general-autoloads finder-inf inline no-littering compat compat-macs
no-littering-autoloads compat-autoloads use-package-ensure
use-package-core use-package-autoloads info bind-key-autoloads
straight-autoloads cl-extra help-mode straight vterm-autoloads package
browse-url url url-proxy url-privacy url-expand url-methods url-history
url-cookie generate-lisp-file url-domsuf url-util mailcap url-handlers
url-parse auth-source cl-seq eieio eieio-core cl-macs password-cache
json subr-x map byte-opt gv bytecomp byte-compile url-vars cl-loaddefs
cl-lib rmc iso-transl tooltip cconv eldoc paren electric uniquify
ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win
term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe
tabulated-list replace newcomment text-mode lisp-mode prog-mode register
page tab-bar menu-bar rfn-eshadow isearch easymenu timer select
scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors
frame minibuffer nadvice seq simple cl-generic indonesian philippine
cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao
korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech
european ethiopic indian cyrillic chinese composite emoji-zwj charscript
charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure
cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp
files window text-properties overlay sha1 md5 base64 format env
code-pages mule custom widget keymap hashtable-print-readable backquote
threads dbusbind inotify dynamic-setting system-font-setting
font-render-setting cairo x-toolkit x multi-tty make-network-process
native-compile emacs)

Memory information:
((conses 16 1921723 1846033)
 (symbols 48 84611 127)
 (strings 32 362545 234980)
 (string-bytes 1 13719482)
 (vectors 16 235448)
 (vector-slots 8 4986314 1621977)
 (floats 8 2363 10829)
 (intervals 56 103989 59198)
 (buffers 992 87))

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

[Brian Leung]

The merge commit 2f0bd8167c0 by Po Lu seems to be where this 
started.

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

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Brian Leung <leungbk@posteo.net> writes:

> The merge commit 2f0bd8167c0 by Po Lu seems to be where this started.

I just ran "M-x gitmerge" and then started the merge from there.  What
could've gone wrong?

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

[Brian Leung]

Po Lu <luangruo@yahoo.com> writes:

> Brian Leung <leungbk@posteo.net> writes:
>
>> The merge commit 2f0bd8167c0 by Po Lu seems to be where this 
>> started.
>
> I just ran "M-x gitmerge" and then started the merge from there. 
> What
> could've gone wrong?

Sorry, I think I made a mistake. Merge commit 64c7b57ae72 by Eli 
seems to be the actual culprit.

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

[Stefan Kangas]

Brian Leung <leungbk@posteo.net> writes:

> For example,
> https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=c83c95634e7a8d0f334ac5d45eebf357e413906c
> and
> https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=b710ca62c00ef90a46fc90a9ae06fdf3bba87bc2
> are not in Emacs 30, at the time of writing, whereas some newer Emacs 29
> commits are on master.

Here's what I see:

$ git fetch
[...]
$ git branch -a --contains b710ca62c00ef90a46fc90a9ae06fdf3bba87bc2 |
grep master
  master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master
$ git branch -a --contains c83c95634e7a8d0f334ac5d45eebf357e413906c |
grep master
  master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

Doesn't this mean that these commits are on the master branch?

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

[Brian Leung]

Stefan Kangas <stefankangas@gmail.com> writes:

> Brian Leung <leungbk@posteo.net> writes:
>
>> For example,
>> https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=c83c95634e7a8d0f334ac5d45eebf357e413906c
>> and
>> https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=b710ca62c00ef90a46fc90a9ae06fdf3bba87bc2
>> are not in Emacs 30, at the time of writing, whereas some newer 
>> Emacs 29
>> commits are on master.
>
> Here's what I see:
>
> $ git fetch
> [...]
> $ git branch -a --contains 
> b710ca62c00ef90a46fc90a9ae06fdf3bba87bc2 |
> grep master
>   master
>   remotes/origin/HEAD -> origin/master
>   remotes/origin/master
> $ git branch -a --contains 
> c83c95634e7a8d0f334ac5d45eebf357e413906c |
> grep master
>   master
>   remotes/origin/HEAD -> origin/master
>   remotes/origin/master
>
> 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.

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

[Eli Zaretskii]

> Cc: 59921@debbugs.gnu.org
> From: Brian Leung <leungbk@posteo.net>
> 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?

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

[Brian Leung]

Eli Zaretskii <eliz@gnu.org> writes:

>> 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?

I was working in one of the files and noticed that a change I knew 
had been made to that file wasn't there.

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

[Brian Leung]

Eli Zaretskii <eliz@gnu.org> writes:

>> Cc: 59921@debbugs.gnu.org
>> From: Brian Leung <leungbk@posteo.net>
>> 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.

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: Fri, 09 Dec 2022 21:08:40 +0000
> 
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> 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?
> 
> I was working in one of the files and noticed that a change I knew 
> had been made to that file wasn't there.

That's "a change", in singular.  But your original message quoted two
commits, not one.  Were both of the discovered by accident?

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.

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

[Eli Zaretskii]

> 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.

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

[Brian Leung]

Eli Zaretskii <eliz@gnu.org> 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.

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 11:36:10 +0000
> 
> 
> Eli Zaretskii <eliz@gnu.org> 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.

Like I did now (look at the addresses).