From 475cdecaf4f4ce4fa0bf0352aad7338c46590300 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 18 May 2026 20:25:57 -0400 Subject: [PATCH] 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 --- src/script/ptl-tool.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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') -- 2.47.3