From: Patrick Donnelly <pdonnell@ibm.com>
Date: Sat, 9 May 2026 02:28:12 +0000 (-0400)
Subject: script/ptl-tool: continue adding conflicts to review when interactive
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F68703%2Fhead;p=ceph.git

script/ptl-tool: continue adding conflicts to review when interactive

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
---

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<details><summary>Click to expand</summary>\n\n```diff\n{diff_text}\n```\n</details>\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)