From 4d6c8ac743d6b21b6210e2fe3d6e69fcec925038 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 5 May 2024 12:50:11 -0700 Subject: [PATCH] More info --- src/python/replay_merge.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py index 6c5ce28053..a4a815d863 100755 --- a/src/python/replay_merge.py +++ b/src/python/replay_merge.py @@ -137,7 +137,8 @@ def merge_replay( raise Exception( 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']}" + + f"{merge_data[f'{merge_tool.name}_merge_fingerprint']} at log path {log_path}" + + f" and repo path {repo.local_repo_path}" ) if merge_result not in (