]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
script/ptl-tool: handle cherry-pick conflicts on branch-specific commits 70165/head
authorPatrick Donnelly <pdonnell@ibm.com>
Mon, 13 Jul 2026 18:24:26 +0000 (14:24 -0400)
committerPatrick Donnelly <pdonnell@ibm.com>
Mon, 13 Jul 2026 18:35:42 +0000 (14:35 -0400)
commiteef55dbb754387711ef846285d2877435e7d1819
treed48a3eb72d7665d6ef6a3016a0de6c602194a668
parent7a0202fa6283f96f52ed4216b7d6e60e8ad92cf9
script/ptl-tool: handle cherry-pick conflicts on branch-specific commits

Previously, ConflictSimulationCheck only anticipated merge conflicts
when simulating upstream cherry-picks. If a branch-specific commit (such
as test repo branch adjustments or backport metadata changes) failed to
apply cleanly to the target base branch, the script threw an unhandled
GitCommandError and crashed with an unhandled traceback.

Wrap branch-specific commit cherry-picks in a try...except block. When a
conflict occurs, abort the cherry-pick, record a "Rebase Required"
simulation failure in the audit report, and either prompt the user in
interactive mode or gracefully halt check execution in CI mode.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
src/script/ptl-tool.py