Reset results

benedikt-schesch · May 12, 2024 · c21e320 · c21e320
1 parent 9e15703
commit c21e320
Show file tree

Hide file tree

Showing 3,303 changed files with 20,926 additions and 20,926 deletions.
diff --git a/results/combined/merges_analyzed/deegree/deegree3.csv b/results/combined/merges_analyzed/deegree/deegree3.csv
@@ -100,7 +100,7 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_t
 145,refs/heads/main,3a15e566cce15ff74a174cb9eee7724f419a1565,b103e6cb2c8bf0bf1c8f83555f9e08eb0a29ad48,a6439a78f2951dbbd842eb91a8ba1e706b26feb9,,False,True,8315d5fe83f42079ac2694d9616dcedad33136b078bea56d40dbff37fe28d57b,Tests_failed,31cea6f396cb29a081fa25e8e405a629265b216dc645b71708c4366268d6f0b1,Tests_passed,False,False
 146,refs/heads/main,a841eac19e7e9dacae8cc060fd6d5334e2a86348,cdab01201c07c9b12490acecc7cd8911f059a9d4,a6439a78f2951dbbd842eb91a8ba1e706b26feb9,,True,True,7d83bb48ebd4921c9176fa8a0ce03edfc433179821dee0b652e36e3a12355091,Tests_passed,31cea6f396cb29a081fa25e8e405a629265b216dc645b71708c4366268d6f0b1,Tests_passed,True,True
 147,refs/heads/main,1aad054dfee6238519a37b8b3a06c772cc14c093,7b5fb511105609b98404ab78d409133d303e0a82,a6439a78f2951dbbd842eb91a8ba1e706b26feb9,,True,True,12215bd659b484c4377b0b4a738af1239470f2282985d27ed2eae3855b4c446d,Tests_passed,31cea6f396cb29a081fa25e8e405a629265b216dc645b71708c4366268d6f0b1,Tests_passed,True,True
-149,refs/heads/main,5684af88a1043c430a29e813182fcd21503fb898,813f9eb105583d05d9e578bc619f01d4dce4a124,22f9896152ee751406084891932902504c16bffd,,False,True,ed846ec7fee6f999a2129d37410155e04e1d4b95ab2336c1e6534dea9fcafba3,Tests_failed,cfa6629033cf1bdb1552cc67ad0af9fe1ed4355d798566a92344f0d41f330ff2,Tests_failed,False,False
+149,refs/heads/main,5684af88a1043c430a29e813182fcd21503fb898,813f9eb105583d05d9e578bc619f01d4dce4a124,22f9896152ee751406084891932902504c16bffd,,True,True,9382074dad330491b1d58c98df65ad41b6274c7303064a31a98526bde6431398,Tests_passed,10f5f6eb851a51a3b6fe0282dd9d5eb653ad05620024453715c41d17be9499bb,Tests_passed,True,True
 150,refs/heads/main,813f9eb105583d05d9e578bc619f01d4dce4a124,c4a841b57167eac0f6fd4f51f7a8bdd129d528ea,d1f95e4c3f70bf49fd0db8101d0b31841821837d,,False,False,,,,,,False
 151,refs/heads/main,c4a841b57167eac0f6fd4f51f7a8bdd129d528ea,ebe36281f602f82e67f01a7599f1c759bcb44192,02b3fe7784adf0830e90980977d63b401cf87109,,False,True,78859a7286af36b76eab51d884e7b5757b46424f5428128bae6a5d9c950fb7b0,Tests_passed,ac64e4743face84d1ffb396d1daeac07fba4ff0b366b78c81c259502a8ac0a20,Tests_failed,False,False
 152,refs/heads/main,ebe36281f602f82e67f01a7599f1c759bcb44192,470af02ebc3133482259dd6fe93399fbc1c6791e,e907116ef7a2d99eeade5ec72688ce29af908da8,,False,False,,,,,,False

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,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,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,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,6f46ec75a746a3c4a8581a73f7497be7bca08ac06774a1e9174c8f4976182f49,Merge_failed,6f46ec75a746a3c4a8581a73f7497be7bca08ac06774a1e9174c8f4976182f49,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a
+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,d38fe1edfb024f7ab0876190ca360c3591ea7d4fcfd6299925bd32697946507f,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a
diff --git a/results/combined/merges_tested/abel533/echarts.csv b/results/combined/merges_tested/abel533/echarts.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
-9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,Tests_passed,True,True,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,29326553a8028f23a6604f8ec4736c8e60bfedd7ee241f8f43a324a7a0cdd8e6,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb
+9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,Tests_passed,True,True,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,29326553a8028f23a6604f8ec4736c8e60bfedd7ee241f8f43a324a7a0cdd8e6,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb
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,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,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,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,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Tests_passed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b