From dd98cad20e0a8244895af18c78f6bf3ad2247b73 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 5 May 2024 14:55:19 -0700 Subject: [PATCH] Better exception --- src/python/replay_merge.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py index 40acac2f70..88b59c2a1a 100755 --- a/src/python/replay_merge.py +++ b/src/python/replay_merge.py @@ -212,7 +212,9 @@ def merge_replay( f"fingerprints differ: after merge of {workdir} with {merge_tool}, found" + f" {merge_fingerprint} but expected " + f"{merge_data[f'{merge_tool.name}_merge_fingerprint']} at log path {log_path}" - + f" and repo path {repo.local_repo_path}" + + f" and repo path {repo.local_repo_path}", + merge_result, + f"idx {merge_idx}", ) if merge_result not in (