Added latest data

benedikt-schesch · Jun 5, 2024 · 359ec77 · 359ec77
1 parent 7311332
commit 359ec77
Show file tree

Hide file tree

Showing 2,444 changed files with 9,430 additions and 9,430 deletions.
diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf
diff --git a/results/combined/merges_tested/ab0oo/javaprslib.csv b/results/combined/merges_tested/ab0oo/javaprslib.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,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,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,True,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,Tests_passed,True,True,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,aa9af827534520af2d7cef78542ceced14f4d4ec4fc62d5be033d9b138f1e691,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f
+2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,True,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,Tests_passed,True,True,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,aa9af827534520af2d7cef78542ceced14f4d4ec4fc62d5be033d9b138f1e691,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f
diff --git a/results/combined/merges_tested/acciente/oacc-core.csv b/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,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
-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,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Tests_passed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Tests_passed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Tests_passed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff
+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,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Tests_passed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Tests_passed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Tests_passed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Tests_passed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff