Skip to content

Commit

Permalink
Add documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst committed May 28, 2024
1 parent 57e9cd0 commit 5b7d58d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/python/replay_merge.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""Replay merges and their test results.
The output appears in the .workdirs/ directory.
Typical usage:
replay_merge.py --idx INDEX
Expand Down Expand Up @@ -234,8 +235,8 @@ def merge_replay(
stdout=subprocess.PIPE,
).stdout.decode("utf-8")
is_conflict = len(conflict_files) > 0
assert (
is_conflict == (merge_result == MERGE_STATE.Merge_failed)
assert is_conflict == (
merge_result == MERGE_STATE.Merge_failed
), f"merge_replay: tool{merge_tool} merge_result {merge_result} does not match conflict_files {conflict_files} at path {repo.local_repo_path}"

result_df.loc[
Expand Down

0 comments on commit 5b7d58d

Please sign in to comment.