Fixed scripts (#296)

.github/workflows/check-reproducibility-inconsistent-results.yml

@@ -0,0 +1,46 @@
+name: Reproducibility Check Inconsistent Results
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      matrix:
+        maven: [ '3.9.2' ]
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
+    steps:
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'zulu'
+        java-version: 17.0.7
+    - run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
+    - run: java -version
+    - uses: actions/checkout@v4
+      with:
+        submodules: 'true'
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+    - name: Setup miniconda
+      uses: conda-incubator/setup-miniconda@v3
+      with:
+        python-version: 3.12
+        auto-update-conda: true
+        mamba-version: "*"
+        channels: conda-forge,defaults
+        activate-environment: AST
+        environment-file: environment.yml
+    - name: Clean caches & workspace
+      run: make clean
+    - run: echo "LOGURU_COLORIZE=NO" >> $GITHUB_ENV
+    - name: Build
+      run: cd src/scripts/merge_tools/merging && ./gradlew -q shadowJar
+    - name: make check-merges-reproducibility
+      run: |
+        python3 src/python/utils/build_inconsistent_merges.py
+        head -n 151 results/combined/result.csv > temp.csv && mv temp.csv results/combined/result.csv
+        make CSV_RESULTS=results/combined/inconsistent_results.csv check-merges-reproducibility
+      env:
+          GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}

results/combined/merges_tested/acciente/oacc-core.csv

@@ -1,2 +1,2 @@
 idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
-4,refs/heads/master,0ca7e4ea4fd000ca5a3b51bb5e2e2fc27f6217f2,57e7150a72573f547092a0054317ffab8219bc45,c32cb07eda7eae130ce52a9cada989e58a1fbfa3,,True,True,9648b81286e53d474cb0ca01597f0a94b155d0dd8b1bd322a8921c3ec40b15c2,Tests_passed,5137eaf1d40f9a64f41e55dfd63637b140570923d93196f215cb3b23151b0dea,Tests_passed,True,True,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,0ad53a1530f8a34063dbd30466d149f7910e477ea05235886981b3b336b9fda5,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Tests_passed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b
+4,refs/heads/master,0ca7e4ea4fd000ca5a3b51bb5e2e2fc27f6217f2,57e7150a72573f547092a0054317ffab8219bc45,c32cb07eda7eae130ce52a9cada989e58a1fbfa3,,True,True,9648b81286e53d474cb0ca01597f0a94b155d0dd8b1bd322a8921c3ec40b15c2,Tests_passed,5137eaf1d40f9a64f41e55dfd63637b140570923d93196f215cb3b23151b0dea,Tests_passed,True,True,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,0ad53a1530f8a34063dbd30466d149f7910e477ea05235886981b3b336b9fda5,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b

results/combined/merges_tested/addthis/meshy.csv

@@ -1,3 +1,3 @@
 idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
 5,refs/remotes/origin/pull/1,1079da2f62ed1b8c096c40aeb293b1f1348d6e5d,6299d33d6b0d3e44d3dca4fec896ed368165dc5c,93106b5a0e7cf303bbb19ac8f2c7af5d6a6f5523,,True,True,d971cadbd932e5b7e11dc49e37ff7632d7af515e9def82bbd9c262f0f0e4db8e,Tests_passed,73a2ef4bdec99c031a98953b8085037f9c3eca3783d158d1e694a6994d31ab36,Tests_passed,True,True,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,8e0d6e22a9ec58addfbdc6336e5e97d18d3791382067799ebb5d9d43d49b500c,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,50ed54678fbbbfcf03713a74e316107fa5c32c9568015f07a2e443b7c630228d,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Merge_failed,cf204e221e073f340db669687c060f6253a60589f8691bd104387d092a1d79bb,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,8e0d6e22a9ec58addfbdc6336e5e97d18d3791382067799ebb5d9d43d49b500c,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,845c63d5517686f91754e200552b71f4df8b8b776642f358382f4e446409d07a,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5
-8,refs/remotes/origin/pull/7,66ca16d72b571aa4ce1ed8286de3484fc007ec45,5f37bbd2de7caa3e5d23f54d4a1e685d37e2a74d,58b0e349f804c13a0214a30a9ac93dcde42be2ca,,True,True,1ff45d0cdda0ae3c5518967939172bd066cb971972d87b36cc1252b07877c87d,Tests_passed,78ec20e951c988bc2eb553cfcaf5bcdc4d03ae76632490c97261b8d9430fa49f,Tests_passed,True,True,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,4556d4267b5a466652b2ae1db1dcb50aba3b62d6e04c9b6bba76997ff41076c5,Merge_failed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617
+8,refs/remotes/origin/pull/7,66ca16d72b571aa4ce1ed8286de3484fc007ec45,5f37bbd2de7caa3e5d23f54d4a1e685d37e2a74d,58b0e349f804c13a0214a30a9ac93dcde42be2ca,,True,True,1ff45d0cdda0ae3c5518967939172bd066cb971972d87b36cc1252b07877c87d,Tests_passed,78ec20e951c988bc2eb553cfcaf5bcdc4d03ae76632490c97261b8d9430fa49f,Tests_passed,True,True,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,4556d4267b5a466652b2ae1db1dcb50aba3b62d6e04c9b6bba76997ff41076c5,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617