Skip to content

Commit

Permalink
Print merge file
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Schesch committed May 5, 2024
1 parent 4d6c8ac commit 1e00bc4
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/python/replay_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ def merge_replay(
merge_data[f"{merge_tool.name}_merge_fingerprint"] != merge_fingerprint
and not dont_check_fingerprints
):
# Print the merge log file
print("=====================================")
with open(log_path, "r", encoding="utf-8") as f:
print(f.read())
print("=====================================")

raise Exception(
f"fingerprints differ: after merge of {workdir} with {merge_tool}, found"
+ f" {merge_fingerprint} but expected "
Expand Down

0 comments on commit 1e00bc4

Please sign in to comment.