Re: master b5bbb29634e 1/5: Merge from origin/emacs-29

[Herbert J. Skuhra]

On Sat, 26 Aug 2023 11:41:08 +0200, Eli Zaretskii wrote:
> 
> > Date: Sat, 26 Aug 2023 11:05:42 +0200
> > From: "Herbert J. Skuhra" <herbert@gojira.at>
> > Cc: Eli Zaretskii <eliz@gnu.org>, yantar92@posteo.net, emacs-devel@gnu.org
> > 
> > > not so far must say.  I've hard time linking a native compiler related
> > > issue with what I see in b5bbb29634e.
> > 
> > Sorry, I guess that's the wrong commit. The problem also occurs with
> > a047fb8494c203bd8f416e7ee9f77ad8dcb03631.
> > 
> > Running 'git log --pretty=oneline' shows:
> > 
> > [...]
> > b5bbb29634eca42582c01e2fd30c867d22f53298 Merge from origin/emacs-29
> > d09de2f49d708f73e7397273a254a7775c294d05 Ignore quit while getting 
> > interprogram paste in kill-new
> > afdf54a5313ec898b6045e48eb6dce7d4abfa565 * lisp/progmodes/gdb-mi.el: Fix 
> > interactive invocation of 'gud-go'.
> > a047fb8494c203bd8f416e7ee9f77ad8dcb03631 Fix "Improve Python imports 
> > management commands"
> > [...]
> > 
> > Why do I get Emacs 29.0.92 when I checkout e.g. the commit before
> > b5bbb29634eca42582c01e2fd30c867d22f53298 (d09de2f49d7 and
> > afdf54a5313)? The version was bumped (from 29.0.50 to 30.0.50) in
> > commit 65456668ab1048fe8d77dc76a9e4d84481c218a5 (Mon Nov 28 20:03:07
> > 2022 +0200).
> 
> Because you are bisecting inside commits made on the emacs-29 branch,
> which were then merged to the master branch.
>
> I suggest to bisect on the emacs-29 branch, not on master.

The emacs-29 branch is OK.

I am now running master (d8b528c8967) with commit 4e8d579f3da reverted
and it seems to resolve the issue.

% git status
On branch master
Your branch is up to date with 'origin/master'.

You are currently reverting commit 4e8d579f3da.
  (all conflicts fixed: run "git revert --continue")
  (use "git revert --skip" to skip this patch)
  (use "git revert --abort" to cancel the revert operation)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   lisp/emacs-lisp/comp.el

--
Herbert