Get base, left, right, and programmer merge

benedikt-schesch · May 19, 2024 · 204635d · 204635d
1 parent b17ed92
commit 204635d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -134,7 +134,7 @@ clean-local:
 check-merges-reproducibility:
 	@echo "Running replay_merge for each idx in parallel using GNU Parallel..."
 	@set -e; \
-	tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% python3 src/python/replay_merge.py --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx {}
+	tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% python3 src/python/replay_merge.py -delete_workdir --idx {}
 
 protect-repos:
 	find repos -mindepth 1 -type d -exec chmod a-w {} +

diff --git a/src/python/repo.py b/src/python/repo.py
@@ -215,6 +215,14 @@ def clone_repo(self) -> None:
         with lock:
             if self.repo_path.exists():
                 return
+            print(
+                "Cloning",
+                self.repo_slug,
+                "to",
+                self.repo_path,
+                "because:",
+                self.repo_path.exists(),
+            )
             try:
                 clone_repo(self.repo_slug, self.repo_path)
             except Exception as e: