From: Vlastimil Babka <vbabka@suse.cz>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: tools@linux.kernel.org
Subject: Re: b4 using specified base-commit yet still fails to apply?
Date: Mon, 26 Feb 2024 17:46:57 +0100 [thread overview]
Message-ID: <41eedcc8-d186-4bab-976f-e92c05e1b488@suse.cz> (raw)
In-Reply-To: <20240226-industrious-meticulous-jaguar-bdacbc@meerkat>
On 2/26/24 16:49, Konstantin Ryabitsev wrote:
> On Mon, Feb 26, 2024 at 03:34:40PM +0100, Vlastimil Babka wrote:
>> Hi,
>>
>> When I do:
>>
>> git checkout v6.8-rc1
>>
>> b4 shazam https://lore.kernel.org/all/20240221194052.927623-1-surenb@google.com/
>>
>> I can see it detects the base commit (which is v6.8-rc5+)
>>
>> Base: using specified base-commit 39133352cbed6626956d38ed72012f49b0421e7b
>>
>> but eventually fails to apply something:
>>
>> Applying: mm: create new codetag references during page splitting
>> Patch failed at 0019 mm: create new codetag references during page splitting
>>
>> If I do first
>>
>> git checkout 39133352cbed6626956d38ed72012f49b0421e7b
>>
>> then it applies cleanly. Is the base-commit handling buggy?
>
> No, this is expected behaviour -- the bug is that we write out the "using
> specified base-commit" line. By default, "shazam" will attempt to apply the
> series directly on top of your current tree, and so the base-commit doesn't
> really matter directly [*].
Makes sense.
> What you probably wanted to do was "b4 shazam -M" or "b4 shazam -H".
-H works for my case (reviewing series), probably not necessary to add some
option that would reset to the base first. I can work with the resulting
FETCH_HEAD. Thanks!
> [*] that said, when we do have base-commit info, we can try to do a 3-way
> merge instead, which we don't currently do. I'll make a note of this.
Sounds good.
> -K
prev parent reply other threads:[~2024-02-26 16:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 14:34 b4 using specified base-commit yet still fails to apply? Vlastimil Babka
2024-02-26 15:49 ` Konstantin Ryabitsev
2024-02-26 16:46 ` Vlastimil Babka [this message]
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=41eedcc8-d186-4bab-976f-e92c05e1b488@suse.cz \
--to=vbabka@suse.cz \
--cc=konstantin@linuxfoundation.org \
--cc=tools@linux.kernel.org \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).