Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update import merge tool #271

Merged
merged 90 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
19d777c
Update
benedikt-schesch Apr 25, 2024
67fd1eb
Bug fix
benedikt-schesch Apr 25, 2024
7d388b6
Fixed imports
benedikt-schesch Apr 26, 2024
66432cf
Update
benedikt-schesch Apr 27, 2024
820413d
Style fix
benedikt-schesch Apr 28, 2024
68036aa
Modified test results
Apr 28, 2024
23640ac
BUg fix
benedikt-schesch Apr 28, 2024
f00ce02
Restore old file
benedikt-schesch Apr 28, 2024
90fb316
Comment fix
benedikt-schesch Apr 28, 2024
9d84bb7
Added latest results
benedikt-schesch Apr 28, 2024
f36e559
Build fixes (#277)
mernst Apr 29, 2024
2f3a75b
Added run data
benedikt-schesch Apr 30, 2024
96108e5
Modified results
benedikt-schesch May 4, 2024
b75936e
Include merge fingerprints in output
mernst May 4, 2024
854fef4
Add `--dont_check_fingerprints` command-line argument
mernst May 4, 2024
c911bf2
Modified replay merge
benedikt-schesch May 4, 2024
3b29bd5
Newest results
benedikt-schesch May 5, 2024
c3e5860
Added some data
May 10, 2024
a348cf7
Simplification
May 10, 2024
cac94ff
Undo whitespace change
mernst May 11, 2024
747c246
Fix typo
mernst May 11, 2024
1ab3f39
Indicate which script is producing output (#290)
mernst May 12, 2024
020cc82
Reset results
benedikt-schesch May 12, 2024
0afa3a8
Removed debugging problem
benedikt-schesch May 12, 2024
ab8485f
Update
benedikt-schesch Apr 25, 2024
aa2517f
Added submodule
benedikt-schesch Apr 25, 2024
253de6f
Fixed imports
benedikt-schesch Apr 26, 2024
0aaca40
Update
benedikt-schesch Apr 27, 2024
61d363b
Restore old file
benedikt-schesch Apr 28, 2024
b1ee6e5
Comment fix
benedikt-schesch Apr 28, 2024
f8ad72d
Added run data
benedikt-schesch Apr 30, 2024
9f6d0b8
Include merge fingerprints in output
mernst May 4, 2024
f2c2a73
Add `--dont_check_fingerprints` command-line argument
mernst May 4, 2024
be8f505
Modified replay merge
benedikt-schesch May 4, 2024
971d502
Newest results
benedikt-schesch May 5, 2024
8c60ada
Added some data
May 10, 2024
2966f18
Simplification
May 10, 2024
ebf5e37
Undo whitespace change
mernst May 11, 2024
2c89bfd
Fix typo
mernst May 11, 2024
83f08a0
Reset results
benedikt-schesch May 12, 2024
ad15ee5
Removed debugging problem
benedikt-schesch May 12, 2024
1710e50
Deleted unused script
May 13, 2024
f9f4cca
Tweaks
mernst May 15, 2024
1e0eb21
Get base, left, right, and programmer merge
mernst May 16, 2024
205dfe4
Align with upstream
mernst May 16, 2024
87c5c63
Removed file
benedikt-schesch May 19, 2024
2f074b9
Reverted results
benedikt-schesch May 19, 2024
bb72aeb
Update test results
benedikt-schesch May 19, 2024
fba3937
Added latest data
benedikt-schesch May 20, 2024
8fe0791
Change pushurl
mernst May 23, 2024
c1c0fa3
Simplify command
mernst May 23, 2024
7a55fd7
Update submodule
mernst May 25, 2024
d5ee1ec
Added latest tools
benedikt-schesch May 26, 2024
291a05e
New merge tools
benedikt-schesch May 27, 2024
7ba856f
Repo fix
benedikt-schesch May 27, 2024
bab646c
Added latest info
benedikt-schesch May 27, 2024
e64804b
Fix
benedikt-schesch May 27, 2024
37d1861
Reset results
benedikt-schesch May 27, 2024
b16b7cd
Reverted some changes
benedikt-schesch May 27, 2024
9285262
Style fix
benedikt-schesch May 27, 2024
5c55d1f
Delete workdir if it does not exist
benedikt-schesch May 27, 2024
5fc474f
Update test results
benedikt-schesch May 27, 2024
a6f7606
updated delete scripts
benedikt-schesch May 28, 2024
22e2a49
Update merge_plumelib
May 28, 2024
fa2b400
Updatge merge_plumelib
May 28, 2024
dab2c3a
Update print
May 28, 2024
822be4f
Style fix
May 28, 2024
e87cca3
Added latest tool
May 28, 2024
667d4fa
Use new `git-mergetool.sh`
mernst May 29, 2024
1d7e045
Fix script name
mernst May 29, 2024
e27f074
Improve diagnostics
mernst May 29, 2024
0890eb3
Updated submodules to latest commits
benedikt-schesch May 30, 2024
087ad17
Update
benedikt-schesch May 30, 2024
a9e8699
Added latest data
benedikt-schesch May 30, 2024
7589f89
Update subproject
mernst May 31, 2024
0de9bf9
Fix directory where `git merge-base` is called
mernst Jun 1, 2024
4f1d95c
Use latest plume-lib merging
mernst Jun 1, 2024
f0c6355
Test results update
benedikt-schesch Jun 1, 2024
6a9fbbd
Added latest data
benedikt-schesch Jun 3, 2024
167585f
Removed the use of parallel
Jun 3, 2024
0bfcbbd
Don't set JAVA_HOME, fix use of `--all`
mernst Jun 4, 2024
1a9a371
Update `merging` submodule
mernst Jun 4, 2024
2a4c21b
Reduce width of column headers
mernst Jun 4, 2024
0012d32
Added latest data
benedikt-schesch Jun 5, 2024
0ca900b
Removed -q
benedikt-schesch Jun 5, 2024
911edb9
Rebased main
benedikt-schesch Jun 5, 2024
13723d4
Update plumelib
benedikt-schesch Jun 6, 2024
6424067
Update plume-lib merging; fixes a bug, so it changes output
mernst Jun 5, 2024
720ac05
Build plume-lib merging, in case the user forgets (#299)
mernst Jun 6, 2024
c6dd35b
Update plots and merged main
Jun 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions .github/workflows/check-reproducibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@ jobs:
run: make clean
- run: echo "LOGURU_COLORIZE=NO" >> $GITHUB_ENV
- name: Build
run: cd src/scripts/merge_tools/merging && ./gradlew -q shadowJar
run: cd src/scripts/merge_tools/merging && ./gradlew shadowJar
- name: make check-merges-reproducibility
run: |
python3 src/python/replay_merge.py --merges_csv results/combined/result.csv -delete_workdir --idx 38-192
head -n 151 results/combined/result.csv > temp.csv && mv temp.csv results/combined/result.csv
make check-merges-reproducibility
env:
Expand Down
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[submodule "src/scripts/merge_tools/merging"]
path = src/scripts/merge_tools/merging
url = https://github.com/plume-lib/merging.git
pushurl = [email protected]:plume-lib/merging.git
ignore = dirty
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,11 @@ clean-local:
rm -rf repos

check-merges-reproducibility:
@echo "Running replay_merge for each idx in parallel using GNU Parallel..."
@echo "Running replay_merge sequentially for each idx..."
@set -e; \
tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% python3 src/python/replay_merge.py --testing --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx {}
for idx in $(shell tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}'); do \
src/python/replay_merge.py --testing --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx $$idx; \
done

protect-repos:
find repos -mindepth 1 -type d -exec chmod a-w {} +
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ To run the stack on all repos:
./run_full.sh
```

To run the stack on all repos and also diff the merges outputs:
To run the stack on all repos and also diff the merges' outputs:

```bash
./run_full.sh -d
Expand Down Expand Up @@ -217,4 +217,4 @@ To investigate differences between two mergers:

* edit file `src/python/select_from_results.py` to reflect the differences you are interested in.
* run `src/python/select_from_results.py` to create a .csv database containing only the differences.
* run `src/python/replay_merge.py --merges_csv CSV_FILE --idx INDEX` (maybe add `-test`) for the index of the merge you are interested in.
* run `src/python/replay_merge.py --idx INDEX` (maybe add `-test`) for the index of the merge you are interested in.
102 changes: 102 additions & 0 deletions results/combined/inconsistent_results.csv

Large diffs are not rendered by default.

Binary file modified results/combined/merges_analyzer_histograms.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions results/combined/merges_tested/47deg/firebrand.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,Tests_passed,True,True,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34
6,refs/heads/master,776567ef4e502d276d9b7f6a3c3ba70754fcabde,ece26b9bb6c5fcb3807dabf5810dce5a7e51cf05,ad5e18e5ce13fb70b20b15cbeb49c380c2049701,,True,True,7443331472584e853baa7fa5152c8a93e8438c566b4f91c905258a0637c94ff3,Tests_passed,212b451b1f4695b9de086e78bf02ef6d9af76b604e8dc0cab2ef61acaa552543,Tests_passed,True,True,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,ab1bd23ccd71385462ed94273ceda67a8a5d2ff5d0625e4739d8136ae584ccd2,Tests_failed,90aeb11365dae7eeb07d4a6b03327ec36bad0247263d116d711e94667ab72eda
7,refs/heads/master,5af53e4af47a4f7638afa8520b08ef519e5042b3,9a06e785e8a0cffa134de02a602715b0cb50b9f8,1a4e908fd03df49084741bbd167328701826caae,,True,True,df81935bef53d48936e123ec5697943b83c1e2d1de2f1417989a85eccf5ded37,Tests_passed,07f6c21a1269399c043bed38e4cbd84111558717b8d10f1367ef0b06092bae3b,Tests_passed,True,True,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,af0ee49e18bdb6a7722bac9576e3c087445d5da94224ce3d7641f6dc266639a9,Tests_failed,ad5d380fdd0a4ef48084507e5859be952065705f53761383f767f3a968ff715b
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,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_adjacent_ignorespace,plumelib_ort_adjacent_ignorespace_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_imports_ignorespace,plumelib_ort_imports_ignorespace_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint,plumelib_ort_version_number_ignorespace,plumelib_ort_version_number_ignorespace_merge_fingerprint
5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,Tests_passed,True,True,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34
6,refs/heads/master,776567ef4e502d276d9b7f6a3c3ba70754fcabde,ece26b9bb6c5fcb3807dabf5810dce5a7e51cf05,ad5e18e5ce13fb70b20b15cbeb49c380c2049701,,True,True,7443331472584e853baa7fa5152c8a93e8438c566b4f91c905258a0637c94ff3,Tests_passed,212b451b1f4695b9de086e78bf02ef6d9af76b604e8dc0cab2ef61acaa552543,Tests_passed,True,True,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,ab1bd23ccd71385462ed94273ceda67a8a5d2ff5d0625e4739d8136ae584ccd2,Tests_failed,90aeb11365dae7eeb07d4a6b03327ec36bad0247263d116d711e94667ab72eda,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0
7,refs/heads/master,5af53e4af47a4f7638afa8520b08ef519e5042b3,9a06e785e8a0cffa134de02a602715b0cb50b9f8,1a4e908fd03df49084741bbd167328701826caae,,True,True,df81935bef53d48936e123ec5697943b83c1e2d1de2f1417989a85eccf5ded37,Tests_passed,07f6c21a1269399c043bed38e4cbd84111558717b8d10f1367ef0b06092bae3b,Tests_passed,True,True,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,af0ee49e18bdb6a7722bac9576e3c087445d5da94224ce3d7641f6dc266639a9,Tests_failed,ad5d380fdd0a4ef48084507e5859be952065705f53761383f767f3a968ff715b,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,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
2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,Tests_passed,True,True,True,True,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02
idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,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,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_adjacent_ignorespace,plumelib_ort_adjacent_ignorespace_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_imports_ignorespace,plumelib_ort_imports_ignorespace_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint,plumelib_ort_version_number_ignorespace,plumelib_ort_version_number_ignorespace_merge_fingerprint
2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,Tests_passed,True,True,True,True,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02
Loading
Loading