From: "Herbert J. Skuhra" <herbert@gojira.at>
To: Eli Zaretskii <eliz@gnu.org>
Cc: acorallo@gnu.org, yantar92@posteo.net, emacs-devel@gnu.org
Subject: Re: master b5bbb29634e 1/5: Merge from origin/emacs-29
Date: Sat, 26 Aug 2023 20:44:02 +0200 [thread overview]
Message-ID: <87msydk5jh.wl-herbert@gojira.at> (raw)
In-Reply-To: <83pm3akuob.fsf@gnu.org>
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
next prev parent reply other threads:[~2023-08-26 18:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <168941374579.21359.4311609468242997473@vcs2.savannah.gnu.org>
[not found] ` <20230715093546.7067CC06C72@vcs2.savannah.gnu.org>
2023-08-07 12:07 ` master b5bbb29634e 1/5: Merge from origin/emacs-29 Herbert J. Skuhra
2023-08-22 12:32 ` Herbert J. Skuhra
2023-08-24 6:02 ` Eli Zaretskii
2023-08-24 9:02 ` Herbert J. Skuhra
2023-08-24 9:15 ` Eli Zaretskii
2023-08-24 11:17 ` Ihor Radchenko
2023-08-24 14:10 ` Herbert J. Skuhra
2023-08-24 15:08 ` Eli Zaretskii
2023-08-24 16:29 ` Herbert J. Skuhra
2023-08-24 16:36 ` Eli Zaretskii
2023-08-25 6:42 ` Ihor Radchenko
2023-08-25 7:18 ` Eli Zaretskii
2023-08-25 7:42 ` Ihor Radchenko
2023-08-25 10:21 ` Eli Zaretskii
2023-08-25 10:36 ` Ihor Radchenko
2023-08-25 9:45 ` Andrea Corallo
2023-08-26 9:05 ` Herbert J. Skuhra
2023-08-26 9:41 ` Eli Zaretskii
2023-08-26 18:44 ` Herbert J. Skuhra [this message]
2024-04-16 22:42 ` Herbert J. Skuhra
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=87msydk5jh.wl-herbert@gojira.at \
--to=herbert@gojira.at \
--cc=acorallo@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=yantar92@posteo.net \
/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.