From 000355d2da16a3dde5cddaffda60d51dd560f160 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 8 May 2026 22:28:12 -0400 Subject: [PATCH] script/ptl-tool: continue adding conflicts to review when interactive Signed-off-by: Patrick Donnelly --- src/script/ptl-tool.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/script/ptl-tool.py b/src/script/ptl-tool.py index d28172440ef3..113cef8a4a8c 100755 --- a/src/script/ptl-tool.py +++ b/src/script/ptl-tool.py @@ -1191,13 +1191,9 @@ class ConflictSimulationCheck(BaseAuditCheck): md_text += f"#### Range Diff\n
Click to expand\n\n```diff\n{diff_text}\n```\n
\n\n" - if args.ci_mode: - report.add("Conflict/Deviation", md_text) - continue - report.add("Conflict/Deviation", md_text) report.record_failure() - break + continue else: log.info(f"Applying branch-specific commit {commit.hexsha[:8]} ...") wt_repo.git(c=SANDBOX_CFG).cherry_pick("--allow-empty", commit.hexsha) -- 2.47.3