From 68ba240ac51d95e3b86f94d12a22beb8135014a1 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Sat, 4 Jul 2026 15:27:52 -0700 Subject: [PATCH 1/4] Code review --- .gitignore | 14 -------------- resolve-conflicts.py | 8 ++++---- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index d6879a9..94a98bf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,17 +3,3 @@ tests/**/Merged*.diff tests/**/Merged*.java -tests/lint-diff-test/guessstrip-lint-pruned.txt -tests/lint-diff-test/reldir-lint-pruned.txt -tests/lint-diff-test/words-lint.txt -tests/lint-diff-test/words1.txt -tests/lint-diff-test/words12-diff.txt -tests/lint-diff-test/words2-lint-pruned.txt -tests/lint-diff-test/words2-lint-pruned.txt-goal -tests/lint-diff-test/words2-lint-pruned.txt-goal-nofilename -tests/lint-diff-test/words2-lint-pruned.txt-nofilename -tests/lint-diff-test/words2-lint.txt -tests/lint-diff-test/words2.txt -tests/**/Merged*.java -tests/**/Merged*.diff -tests/sort-compiler-output-test/errors1-sorted.actual diff --git a/resolve-conflicts.py b/resolve-conflicts.py index 11fa612..138ae9f 100755 --- a/resolve-conflicts.py +++ b/resolve-conflicts.py @@ -5,7 +5,7 @@ """Edits a file in place to remove certain conflict markers. -Usage: resolve-conflicts.py [options] +Usage: resolve-conflicts.py [options] Only one option is acted upon. To address multiple types of conflict markers, run the program more than once. @@ -16,8 +16,8 @@ --blank_lines: Resolves conflicts due to blank lines. If "ours" and "theirs" differ only in whitespace (including blank lines), then accept "ours". ---java_imports: Resolves conflicts related to Java import statements -The output includes every `import` statements that is in either of the parents. +--java_imports: Resolves conflicts related to Java import statements. +The output includes every `import` statement that is in either of the parents. Exit status is 0 (success) if no conflicts remain. Exit status is 1 (failure) if conflicts remain. @@ -101,7 +101,7 @@ def main() -> None: i += num_lines tmp.close() - shutil.copy(tmp.name, filename) + shutil.copyfile(tmp.name, filename) Path(tmp.name).unlink() if conflicts_remain: From c29da1420377edf65bce4dda5e35174250243ebb Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 6 Jul 2026 12:21:06 -0700 Subject: [PATCH 2/4] Disable test of `git-clone-related` under GitHub Actions --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2a4917b..d63b6e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,4 +19,7 @@ jobs: run: | git config --global user.email "example@example.com" git config --global user.name "Example Example" - make test + # TODO: reinstate `make test` and remove the other `make` calls + # make test + ${MAKE} -C tests/resolve-adjacent-conflicts-test + ${MAKE} -C tests/resolve-import-conflicts-test From e4f9b7d1d20b17c2bec3a2e45c6c253f776b9d04 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 6 Jul 2026 12:23:35 -0700 Subject: [PATCH 3/4] Don't use `MAKE` variable --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d63b6e6..c0a4a3d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,5 +21,5 @@ jobs: git config --global user.name "Example Example" # TODO: reinstate `make test` and remove the other `make` calls # make test - ${MAKE} -C tests/resolve-adjacent-conflicts-test - ${MAKE} -C tests/resolve-import-conflicts-test + make -C tests/resolve-adjacent-conflicts-test + make -C tests/resolve-import-conflicts-test From d4e428a7656f33155742132365534bcac4083103 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 6 Jul 2026 14:33:10 -0700 Subject: [PATCH 4/4] Don't skip failures --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c0a4a3d..d967bc0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,5 +21,4 @@ jobs: git config --global user.name "Example Example" # TODO: reinstate `make test` and remove the other `make` calls # make test - make -C tests/resolve-adjacent-conflicts-test - make -C tests/resolve-import-conflicts-test + make -C tests/resolve-adjacent-conflicts-test && make -C tests/resolve-import-conflicts-test