[Backport release-v1.4-v4.1-branch] Failed to backport #852

[andriy-bilynskyy]

This issue was created automatically because the backport of #852 to release-v1.4-v4.1-branch failed.

The backport to release-v1.4-v4.1-branch failed:

The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch backport-852-to-release-v1.4-v4.1-branch
You are currently cherry-picking commit 263138327c1.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-v1.4-v4.1-branch release-v1.4-v4.1-branch
# Navigate to the new working tree
cd .worktrees/backport-release-v1.4-v4.1-branch
# Create a new branch
git switch --create backport-852-to-release-v1.4-v4.1-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x def3c4a15d300f60f127896c4635f71385e21a18~2..def3c4a15d300f60f127896c4635f71385e21a18
# Push it to GitHub
git push --set-upstream origin backport-852-to-release-v1.4-v4.1-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-v1.4-v4.1-branch

Then, create a pull request where the base branch is release-v1.4-v4.1-branch and the compare/head branch is backport-852-to-release-v1.4-v4.1-branch.

[damien0x0023]

@strandingneko-vivi @wuhaoTelink

It seems that mis-matches of old revisions in west.yml cause the backport failure again.
I believe there are two ways to do the following backport jobs.

1. Please approve and merge [Backport release-v1.4-v4.1-branch] west: update hal_telink & telink_ble_sdk (#846, #852) #862 first and then try to trigger auto backport in refactor: tl5218x: update the lpd level with driver condfirmed. #852.
2. Or do the revision update manually (include content in both west: update hal_telink #846 and refactor: tl5218x: update the lpd level with driver condfirmed. #852) in [Backport release-v1.4-v4.1-branch] west: update hal_telink & telink_ble_sdk (#846, #852) #862.

[damien0x0023]

Same root cause as #859 (the action's commit-range logic pulls in the already-applied 263138327c1). The #852 manifest updates are now included in PR #862. Closing this tracking issue.