smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pickman: Record review handling for cherry-5b5124e3d5c

Browse Source
This commit is contained in:
Simon Glass
2025-12-20 11:03:13 -07:00
committed by Simon Glass
parent a817f785ac
commit 2b2444f5a8
1 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
.pickman-history
View File

@@ -889,3 +889,68 @@ The build completed successfully.
The branch `cherry-ddb0f26dc45` is ready for pushing.
---
### Review: 2025-12-20
Branch: cherry-5b5124e3d5c
Comments addressed:
### Conversation log
Let me find the correct directory:
Good, I'm already in the correct directory. Now let me checkout the branch and rebase:
Now let me fetch the latest ci/master and perform the rebase:
Good, ci/master is updated. Now let me check the current base and then rebase:
There's a conflict in `.pickman-history`. This is a history tracking file that just appends entries. Let me resolve it:
This is a conflict in the `.pickman-history` file which just tracks history entries. I should keep both entries. Let me resolve this:
I see, the file has conflict markers. For `.pickman-history`, the proper resolution is to keep both entries (the one from HEAD and the one being rebased). Let me resolve this by keeping the content from HEAD first, then appending the content from the rebase:
The rebase completed successfully. Let me verify the result:
The rebase was successful. The commits are now based on the latest `ci/master`. Now let me run the build verification:
Build passed. Now let me check if there's already a `-v2` branch and create the appropriate versioned local branch:
No existing versioned branches. Let me create the `-v2` branch:
Now let me force push to the original remote branch to update the MR:
The pickman command doesn't have a `push-branch` subcommand. Let me push directly using git:
The push was successful. Let me provide a summary of what was done:
## Rebase Summary
### Actions Performed:
1. ✅ Checked out branch `cherry-5b5124e3d5c`
2. ✅ Fetched latest `ci/master`
3. ✅ Rebased onto latest `ci/master` with `--keep-empty`
4. ✅ Resolved conflict in `.pickman-history` (history tracking file - kept the current branch's entry)
5. ✅ Build verification passed (`crosfw sandbox -L`)
6. ✅ Created local backup branch `cherry-5b5124e3d5c-v2`
7. ✅ Force pushed to remote branch `cherry-5b5124e3d5c` to update MR
### Commit Log After Rebase:
```
4d6e295c223 pickman: Record cherry-pick of 3 commits from us/next
acf5c3fc886 Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog
c782a155f8c watchdog: rti: drop hack manipulating WDT clock rate
fd49c8493de watchdog: rti: support SPL (or re-start)
```
### Pipeline Triggered:
MR !265: https://concept.u-boot.org/u-boot/u-boot/-/merge_requests/265
### Suggested Reply to MR:
```
Rebased onto latest ci/master. A new pipeline has been triggered to verify the changes.
```
---