Reset results

benedikt-schesch · May 27, 2024 · 45a2c57 · 45a2c57
1 parent b91f693
commit 45a2c57
Show file tree

Hide file tree

Showing 1,825 changed files with 14,335 additions and 14,999 deletions.
diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf
diff --git a/results/combined/merges_tested/accla/d4m_api_java.csv b/results/combined/merges_tested/accla/d4m_api_java.csv
@@ -1,6 +1,6 @@
 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,09c65cd9540ef816799eb0540ec463ec912a300a,590e67d0d93811d58b9454be6a0c9178e7f2ba3f,fc2a9e2cffc52f1f4392b5552555196d7e41dc49,,True,True,b1fc4677d158a76fd8a141595ff1c8791f73abced5b525bfd20fa515589570b7,Tests_passed,66af1d880972b5291a442f2ae4572de0c31e6146d48a15a4422715f1d8a235b8,Tests_passed,True,True,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Merge_failed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5
 11,refs/heads/master,3d17b93fcaca70344f20d3adcd3bcb71b71ab097,dcd1e6bfeb129f5e5ca5c693082f255b47953e71,ffa103b362d32bf79911c413e0b290954a212577,,True,True,84bf4629f950943fc40bda04af8cfe5a677d96ca7482eace7e62211b8251690d,Tests_passed,591e65e775e1fe25a44402f01cc237c299ab39e77b832912a9dba9d5aeabfbd8,Tests_passed,True,True,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,4fa0d1a98a18b2f58ca89c97803a82f41b69e994d5199796c7abdb7d899a313a,Merge_failed,5f0f26c4b01cdcd5b10f8d21cf50dd24f18909cbc1286cdb4c3057e1ce2c7d64,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,32807dc1e632a981efb923294f9ff9151015e5097849c94b51640fe621fa6ebb
-12,refs/heads/master,31dd135b6787853c444473b11b049f41e63d939d,5d66714f7e8d8c8b46a5129e3cf01720dfa89632,69ae63c52d595f71875ebcadc6455b624ac86e1f,,True,True,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,8e702a8d2b5ca4c259fc2c6dd476b91c98e8ac8e678754bdf17f1c0ec9b1501c,Tests_passed,True,True,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,ff7767b81cf5e947df2b9016c4a623f701df1817c883bcd09ba07cafd14e3d70,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e
-13,refs/heads/master,5d66714f7e8d8c8b46a5129e3cf01720dfa89632,cd74061ea76e2dd5575aaa01b6f5848cd27373ac,7b900a1a2e4cb07106457f1e628372d3c3f637f2,,True,True,cac68f4ff8feaa2e2014831483871608611539f7f99a1eefb8fff54e0ca1845a,Tests_passed,dfd7b7fb9b9a7b55bcaba06830055638cf68736552d48ef951bd2ec8e0af7f14,Tests_passed,True,True,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,b0e481e56d23c84b1ed75fc85ce62133e06be3c10165558886e372a2210a16c5,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3
+12,refs/heads/master,31dd135b6787853c444473b11b049f41e63d939d,5d66714f7e8d8c8b46a5129e3cf01720dfa89632,69ae63c52d595f71875ebcadc6455b624ac86e1f,,True,True,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,8e702a8d2b5ca4c259fc2c6dd476b91c98e8ac8e678754bdf17f1c0ec9b1501c,Tests_passed,True,True,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,ff7767b81cf5e947df2b9016c4a623f701df1817c883bcd09ba07cafd14e3d70,Tests_failed,3368051063b0ff8616663278753e3111927f48a772891f717ff1581a106604fe
+13,refs/heads/master,5d66714f7e8d8c8b46a5129e3cf01720dfa89632,cd74061ea76e2dd5575aaa01b6f5848cd27373ac,7b900a1a2e4cb07106457f1e628372d3c3f637f2,,True,True,cac68f4ff8feaa2e2014831483871608611539f7f99a1eefb8fff54e0ca1845a,Tests_passed,dfd7b7fb9b9a7b55bcaba06830055638cf68736552d48ef951bd2ec8e0af7f14,Tests_passed,True,True,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,Tests_passed,b0e481e56d23c84b1ed75fc85ce62133e06be3c10165558886e372a2210a16c5,Tests_failed,e78ae4f482587be6b5420f4890b51bde3e90ddeecf556e5113d2c42f7e972110
 20,refs/remotes/origin/expMultiInstance,0035e071eea8e01a88fd0aee3ea52c94e0141471,640b26d7cd92620c1138b3649a6ccc79ab4a5aaa,ce82ce11f6fd38916fa39dfbdc1ab2fc85241294,,True,True,af5d8ed4f4250fa786827432a9905c7fd79d24191f0a33eb2630fe26c8b7b997,Tests_passed,b0af42678a62d00ba442636698678508c015976ad63e8db4636d2a34b456ca2f,Tests_passed,True,True,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1,Tests_passed,607f42be6bfc2337a954faf8c2724864dab58d8e31b697da71eed99803747edd,Tests_passed,d3cbc7bf2255d206d418862edccc321e71a36cdc1e8ced10397d96f7a066b8e1
diff --git a/results/combined/merges_tested/adamd/z.csv b/results/combined/merges_tested/adamd/z.csv
@@ -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
-1,refs/heads/master,da778dcb9cf35110cc3b35d9c4c26a66238d3450,f8384828f24a11ae196120ff713d10f772828334,3bee6597c0de4c16e2050187c6c18b753a93cee4,,108d15f512d15b3844a5e3cf260858f271ab6b7f85a9fcc2843f4c044250a122,Tests_passed,52bbd0b851c78d8f31bd94992c4d977de86880020109607f7f52095ab16c7025,Tests_passed,True,True,True,True,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,a1904180eec746d81df4ebd7d31d641e3c2bc0abba0026933257f1ec487084eb,Tests_passed,82fcc032f233130b52e61a32a1d09986fd5c3a4bd678758c5115182c292da01d,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Merge_failed,c7c8c3dcba62ab2f7540aa63637b67bcb1191b6545eca27397f3d3a204dd183a
+1,refs/heads/master,da778dcb9cf35110cc3b35d9c4c26a66238d3450,f8384828f24a11ae196120ff713d10f772828334,3bee6597c0de4c16e2050187c6c18b753a93cee4,,108d15f512d15b3844a5e3cf260858f271ab6b7f85a9fcc2843f4c044250a122,Tests_passed,52bbd0b851c78d8f31bd94992c4d977de86880020109607f7f52095ab16c7025,Tests_passed,True,True,True,True,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,a1904180eec746d81df4ebd7d31d641e3c2bc0abba0026933257f1ec487084eb,Tests_passed,82fcc032f233130b52e61a32a1d09986fd5c3a4bd678758c5115182c292da01d,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Tests_failed,64925337da7f3f3f6781e07b6570448db868540db54950b4b57cb193d9652b68