]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
script/ptl-tool: continue adding conflicts to review when interactive 68703/head
authorPatrick Donnelly <pdonnell@ibm.com>
Sat, 9 May 2026 02:28:12 +0000 (22:28 -0400)
committerPatrick Donnelly <pdonnell@ibm.com>
Mon, 11 May 2026 12:23:26 +0000 (08:23 -0400)
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
src/script/ptl-tool.py

index d28172440ef3f0a99eed7992b311c734ced4b456..113cef8a4a8ce95b265d3e30dc641ba7bedecdd0 100755 (executable)
@@ -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)