From: "Kernel.org Bugbot" <bugbot@kernel.org>
To: tools@linux.kernel.org, quic_jjohnson@quicinc.com,
tools@kernel.org, konstantin@linuxfoundation.org
Subject: Re: b4 prep --cleanup failure with cover-strategy: branch-description
Date: Tue, 02 Jul 2024 15:55:10 +0000 [thread overview]
Message-ID: <20240702-b218994c2-c31cdf784584@bugzilla.kernel.org> (raw)
In-Reply-To: <ca8f8cab-e62c-4784-bdf8-9c92b2c0202c@quicinc.com>
quic_jjohnson writes via Kernel.org Bugzilla:
Some additional information about my workflow that may have impacted this issue.
I have one workspace called 'development' where I do most of my work, and it was in this workspace where I was performing tree-wide additions of missing MODULE_DESCRIPTION() macros using my standard x86_64 build configuration.
At one point I realized that I would not find issues with other ARCH settings with this configuration, so I then created a second workspace called 'arm64' which used the 'development' workspace as the remote. And as the name suggests, I originally updated the config in this workspace to build arm64 instead of x86_64, but that is probably not important. But what may be important is that when I encountered arm64 issues, I created b4 branches in the 'arm64' workspace.
Only later did I realize that having tree-wide WIP in two separate workspace was going to complicate my record keeping, so I pushed my WIP from 'arm64' to 'development'.
Today I tried to clean up one of the branches since the commit has landed in linux-next.
In my development workspace I see:
[jjohnson:development 9385] git checkout b4/md-arm64-drivers-edac
Updating files: 100% (10338/10338), done.
Switched to branch 'b4/md-arm64-drivers-edac'
[jjohnson:development 9386] b4 prep --show-info
CRITICAL: This is not a prep-managed branch.
In my arm64 workspace I see:
[jjohnson:arm64 1] git checkout b4/md-arm64-drivers-edac
Switched to branch 'b4/md-arm64-drivers-edac'
Your branch is up to date with 'development/b4/md-arm64-drivers-edac'.
[jjohnson:arm64 2] b4 prep --show-info
branch: b4/md-arm64-drivers-edac
cover-subject: md-arm64-drivers-edac
base-branch: linux-master
base-commit: 83a7eefedc9b56fe7bfeff13b6c7356688ffa670
start-commit: 83a7eefedc9b56fe7bfeff13b6c7356688ffa670
end-commit: c4515adee140419f499b576d3db7f0a1ef797ec3
series-range: 83a7eefedc9b56fe7bfeff13b6c7356688ffa670..c4515adee140419f499b576d3db7f0a1ef797ec3
change-id: 20240613-md-arm64-drivers-edac-2fa423340d75
revision: 3
cover-strategy: branch-description
needs-editing: True
needs-recipients: False
has-prerequisites: False
needs-auto-to-cc: False
needs-checking: False
needs-checking-deps: False
preflight-checks-failing: True
commit-c4515adee140: EDAC: add missing MODULE_DESCRIPTION() macros
series-v2: 83a7eefedc9b..8c38b6b182e5 20240617-md-arm64-drivers-edac-v2-1-6d6c5dd1e5da@quicinc.com
series-v1: 83a7eefedc9b..5127f12ffcdd 20240613-md-arm64-drivers-edac-v1-1-149a4f0f61bb@quicinc.com
[jjohnson:arm64 3] git checkout linux-master
Switched to branch 'linux-master'
Your branch is up to date with 'linus/master'.
[jjohnson:arm64 4] b4 prep --cleanup b4/md-arm64-drivers-edac
Traceback (most recent call last):
File "/usr2/jjohnson/.local/bin/b4", line 8, in <module>
sys.exit(cmd())
File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/command.py", line 417, in cmd
cmdargs.func(cmdargs)
File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/command.py", line 83, in cmd_prep
b4.ez.cmd_prep(cmdargs)
File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/ez.py", line 2766, in cmd_prep
return cleanup(cmdargs.cleanup)
File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/ez.py", line 2332, in cleanup
ts = tracking['series']
KeyError: 'series'
View: https://bugzilla.kernel.org/show_bug.cgi?id=218994#c2
You can reply to this message to join the discussion.
--
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (peebz 0.1)
next prev parent reply other threads:[~2024-07-02 15:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-27 2:23 b4 prep --cleanup failure with cover-strategy: branch-description Jeff Johnson
2024-06-27 14:23 ` Konstantin Ryabitsev
2024-06-27 14:25 ` Kernel.org Bugbot
2024-07-02 15:55 ` Kernel.org Bugbot [this message]
2024-07-02 16:15 ` Kernel.org Bugbot
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=20240702-b218994c2-c31cdf784584@bugzilla.kernel.org \
--to=bugbot@kernel.org \
--cc=konstantin@linuxfoundation.org \
--cc=quic_jjohnson@quicinc.com \
--cc=tools@kernel.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 NNTP newsgroup(s).