From: Patrick Donnelly <pdonnell@ibm.com>
Date: Tue, 19 May 2026 00:25:57 +0000 (-0400)
Subject: script/ptl-tool: use provided base even in conflict
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=475cdecaf4f4ce4fa0bf0352aad7338c46590300;p=ceph.git

script/ptl-tool: use provided base even in conflict

It is sometimes useful to base off a local branch instead of a common
branch.

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

diff --git a/src/script/ptl-tool.py b/src/script/ptl-tool.py
index 31ddb55edc8c..5921c5c9ce52 100755
--- a/src/script/ptl-tool.py
+++ b/src/script/ptl-tool.py
@@ -1773,8 +1773,7 @@ def build_branch(args):
         response = get_pr_info(session, pr)
         detected_base = response.get("base", {}).get("ref")
         if base and detected_base and detected_base != base:
-            log.error(f"Base mismatch! PR #{pr} targets '{detected_base}' but expected '{base}'.")
-            sys.exit(1)
+            log.warning(f"Base mismatch! PR #{pr} targets '{detected_base}' but expected '{base}'. Trusting provided --base.")
 
         remote_ref = "refs/pull/{pr}/head".format(pr=pr)
         remote_sha1 = response.get('head', {}).get('sha')